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