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