Merge branch 'rnou/368-release-0-9-5' into 'master'

Resolve "Release 0.9.5"

Closes #368

Closes #368

See merge request !267