Closes #17
Merge branch 'enhancement-#17' into develop