Merge pull request #12 from apoelstra/patch-2