issue #177 - all unit tests pass