Fixes
Merge pull request #60 from IOIOI/master

Fixes