Fixes
Merge pull request #4 from PhaxeNor/master

Fixes