Merge pull request #35 from csparpa/develop

Release 2.0.0 merge
Fix unit tests and update modules for upcoming release
Merge pull request #36 from csparpa/master

Back merge to develop