Issue #38 fixed.