Issue #8 fixed.