proposal for #228
Merge remote-tracking branch 'jorisd/issue/228' into development