Fixes
Merge pull request #5 from TheRishka/master

Fixes