Issue #70 fixed.