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