Fixes
Merge pull request #2 from faisalr/master

Fixes