Merge pull request #56 from Ishap/master

Fixes