Merge branch 'MB_M3_2.0' into 'master'

scenario improved, formatting of all files, added logic for creating for...

See merge request !43