Issue #48 fixed.