Fixes
Merge pull request #8 from toyr99/patch-8

Fixes