Merge pull request #85 from IOIOI/master

Fixes, fixes, fixes
Enhancements