#192 develop to master for v0.4

Merged Dennis Hendriks requested to merge develop into master

Merge request reports