Refactoring: better gameplay, some bugs fixed
Merge pull request #20 from Enlightment/master

Refactoring: better gameplay, some bugs fixed