Fixes #23
Merge branch 'issue-23' into development