PR - Fix to #34
Merge pull request #36 from Arrogance/develop

PR - Fix to #34