Fixes
Merge pull request #7 from PhaxeNor/master

Fixes