Fixes #26

Merged Michelle Weidling requested to merge bugfix/fix-#26 into develop

Merge request reports