Merge pull request #109 from Open-Transactions/develop

Develop