Issue #41 fixed