Cleanup/maxwellstefan

Merged Katharina Heck requested to merge cleanup/maxwellstefan into master

this closes #478 (closed)

Merge request reports