Issue #51 fixed