bug fixes
Merge pull request #96 from sudosuu/master

Bug fixes