Fixes from b2ae7a2
Merge pull request #190 from Marcuzz/master

Fixes from b2ae7a2