Fixes and clean-up
Merge pull request #7 from TheOleg/master

Fixes and cleanup