Agreed with Franz on this one, #222 or #444 would be an easy merge. ;)