Merge pull request #95 from Open-Transactions/develop

Develop
Merge pull request #96 from randy-waterhouse/develop

Merge pull request #95 from Open-Transactions/develop