Merge pull request #158 from monocongo/develop

Additional test coverage, cleanups

Former-commit-id: cea10b5

Merge pull request #41 from monocongo/comparison_analysis

README updates

Former-commit-id: fa33373