Merge pull request #95 from Open-Transactions/develop

Develop-master merge commit added back to develop.