Merge pull request #12 from atengler/feature/reclass-states

Reclass states