Closes #43
Merge branch 'issue-43'