Close #7
Merge branch 'enhancement-#7' into develop