Fixed #79
Fixed #50
Merge pull request #91 from fruitwasp/master

Fixed #50, fixed #79