Fixes
Merge pull request #3 from PhaxeNor/master

Fixes