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