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