Merge pull request #17 from apoelstra/patch-3