#342 develop to master for v0.6

Ferdie Reijnen requested to merge develop into master

Addresses #342 (closed)

Merge request reports