unit tests pass, fixes #67