Merge pull request #14 from s0undt3ch/master

Some more tweaks to the states
Merge pull request #15 from s0undt3ch/master

Fix the package name.
Fix the other package name.
Merge pull request #16 from holmboe/patch-1

Fix the second package name.