Tentatively commit these breaking changes.
Merge pull request #76 from christophemarois/crypto-bug

Tentatively commit these breaking changes.