Issue #47 fixed