Fixes #24;
Merge branch 'issue-24' into development