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