Fixes #9.
Merge branch 'issue-9' into develop