This works correcty
Merge pull request #1 from ethz-asl/fix/work-correctly

This works correcty