Issue #30 fixed