Resolve "Clean up develop"

Florian Oppermannrequested to merge
68-clean-up-develop into develop

Closes #68

Edited by Florian Oppermann

Merge request reports