Issue #61 fixed.