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