Merge pull request #1 from uweenukr/master

Cough
Merge pull request #2 from uweenukr/master

More clean up and work to FindState()
Working, needs polish
Merge pull request #1 from M1nistry/master

Merging