Fixes
Merge pull request #8 from PhaxeNor/master

Fixes