Merge pull request #45 from abdulrauf/master

Fixes
Merge branch 'refs/heads/master' into 2.7