Release v0.9.4
Merge branch 'master' into develop