Close #15 and fixes #16
Merge branch 'enhancement-#15' into develop