Closes #30, closes #31, closes #32, closes #33
Merge branch 'enhancement-#w30' into develop