Merge pull request #23 from blockchain/master