Fixes
Merge pull request #11 from Vandenn/master

Fixes