Really close #53
Merge branch 'enhancement-#53' into develop