Fixes #94
Merge pull request #97 from pulse00/develop

Fixes #94