Issue #52 fixed