Iss 30

Merged Frederik Rehbach requested to merge iss_30 into develop

Fixes #30 (closed)

Merge request reports