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