Close #9, #12, #13
Merge branch 'enhancement-#9' into develop