Fixes
Merge pull request #7 from yashrajsingh/master

Fixes