Merge pull request #4 from deltaprotocol/prerelease-dev-branch

Saturday commit
Merge pull request #5 from deltaprotocol/master

Merge pull request #4 from deltaprotocol/prerelease-dev-branch