Develop

Johannes Winterrequested to merge
develop into master

This closes #81 (closed), #82 (closed), #83 (closed)

Edited by Johannes Winter

Merge request reports