20 and 22 implemented but still untested
Close #20 and close #22
Merge branch 'enhancement-#20-#22' into develop