#367 Finish v0.4.1
Merge branch 'master' into develop