Diederik van der Boor

Patches by:
* Basil S.
* François Guérin
