João Távora <joaotavora@gmail.com> writes:

> Good ideas. Patches welcome, the shorter the better, of course.

Done: