Issue #26 fixed