Merge pull request #5 from heuripedes/master

Fixes and cleanups
Implement save states