Merge pull request #195 from Open-Transactions/develop

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

Merge pull request #195 from Open-Transactions/develop