#15 Object state in progress
Merge branch 'master' of https://github.com/mihaistoie/histria