Issue #25 fixed (merge of d2408e7, 3.0-unstable).