Resolve "fix master review"

Merged Fabian Nuraddin Alexander Gabel requested to merge 26-fix-master-review into dev

Closes #26 (closed)

Edited by Fabian Nuraddin Alexander Gabel

Merge request reports