Closes #5
Merge branch 'enhancement-#5'