Awesome refactoring
Merge pull request #7 from thoferon/states

Awesome refactoring