Fixes
Merge pull request #6 from icomrade/master

Fixes