Fixes
Merge pull request #6 from PhaxeNor/master

Fixes