#481 develop to master for v0.9

Merged Dennis Hendriks requested to merge develop into master

Addresses #481 (closed)

Merge request reports