Replacement for @raoulb pr#914

See #914

ToDo:
- [x] tests
- [x] final rebase
Not reachable for me at the moment. Better remove.
It is not a well known source anyway I think.