Merge branch 'rnou/334-release-0-9-4' into 'master'

Resolve "Release 0.9.4"

Closes #334

Closes #334

See merge request !221