Issue #49 fixed