Issue #66 fixed