Closes #3
Merge branch 'enhancement-#3'