Fixes
Merge pull request #5 from ktabori/master

Fixes