Fixing Issue #8.  Tests pass