Merge branch 'master' into unitTests
Issue #13 writing tests to verify issue #26
Merge branch 'unitTests'