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