98% test coverage
Merge pull request #10 from john5223/master

98% test coverage
Merged in content from upstream