Merge pull request #210 from Open-Transactions/develop

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

Merge pull request #210 from Open-Transactions/develop