Close #25
Merge branch 'enhancement-#25' into develop
Close #24
Merge branch 'enhancement-#24' into develop