issue #25 tests passing fix
Merge pull request #29 from dhilt/master

issue #25 tests passing fix