Merge pull request #7 from ordrin/dev_felix

Dev felix
Refactor required files
Merge pull request #8 from ordrin/dev_luis

Refactor required files
Bumped version number
Merge pull request #9 from ordrin/dev_luis

Bumped version number
a little aggressive on our state field validation