done issue 67 (#67)