update with changes in fork

Merged Ralf Pernecker requested to merge update_fork into master

get changes from the forked project

Merge request reports