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