Fix issue #35

Apply proposed fix, which works. And proves that the current refactoring is
worth it.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>
Announce 1.4.9

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>
Next version will be 1.99.0

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>