This is based on #7 and should only be applied after merging it.
rebased onto ef323a0241eb8e0ec5dd9180e15e87599d9ca618
Looks good, thanks Nils!
Pull-Request has been merged by pbokoc
This is based on #7 and should only be applied after merging it.