Issue #43 fixed