Issue #25 fixed.