Closes #7
Merge branch 'enhancement-#7'