#340 develop to master for v0.6-M1

Merged Dennis Hendriks requested to merge develop into master

Addresses #340 (closed)

Merge request reports