Issue #32 fixed