Merge pull request #152 from Open-Transactions/develop

Develop