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