Fixes
Merge pull request #24 from REJack/master

Fixes