Fixes
Merge pull request #1 from sidhu18/master

Fixes