Fixes #4
Merge pull request #23 from theponti/develop

Fixes #4