roosje
Merge pull request #1802 from roosje/add-roosje2

Merging PR from @roosje