Merge pull request #45 from abdulrauf/master

Fixes