update #275 branch

update branch with latest developments

Merge request reports

Loading