fixes #50
Merge pull request #51 from Shiti/develop

fixes #50