changed #28
changes as proposed to #28
Merge pull request #1 from hiaselhans/feature/task-3679

Feature/task 3679