Kaminski dev

Nils Kaminskirequested to merge
kaminski-dev into master

Merge support for emam+opt and emad in master

Merge request reports