Fixes
Merge pull request #17 from DonoA/master

Fixes