Fixes, updates and other stuff
Merge pull request #74 from IOIOI/master

Fixes, updates and other stuff