Fixes
Merge pull request #5 from yashrajsingh/master

Fixes