Fixes #4
Merge pull request #5 from Gared/develop

Fixes #4