Merge pull request #38 from chuckdumont/master

Version 1.0 changes
Merge pull request #39 from chuckdumont/master

Resolve merge conflicts
Merge pull request #42 from chuckdumont/master

Jenkins unit test failures
More Jenkins fixes