Fixes, fixes, fixes #2
Merge pull request #92 from IOIOI/master

Fixes, fixes, fixes #2