Merge pull request #120 from evoskuil/version2

Merge @swansontec rfc6979