#167 develop to master for v0.3-M1

Merged Dennis Hendriks requested to merge develop into master

Merge request reports