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