Issue #36 fixed