Merge pull request #4 from apoelstra/patch-1