Added waeren
Merge pull request #1834 from waeren/add-waeren

Merging PR from @waeren