Tests pass with new code
Merge pull request #41 from kz363/master

Tests pass with new code