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