Close #72, close #73 and close #74
Merge branch 'enhancement-#72' into develop