Bugfix/#10 #11 minor

Mathias Goebelrequested to merge
bugfix/#10-#11-minor into develop

closes #10 (closed) closes #11 (closed)

Edited by Mathias Goebel

Merge request reports