Issue #25 completed, issue #24 unit tests completed