issue 52 fixed