Merge pull request #49 from mLuby/dev

With our test coverage combined, we are!