Merge pull request #2 from apoelstra/patch-1