Proper Fix for #14

Merged Philip Müller requested to merge master into devel

Created by: philmmanjaro

Merge request reports