#263 develop to master for v0.5-M1

Merged Dennis Hendriks requested to merge develop into master

Addresses #263 (closed)

Merge request reports