Merge pull request #96 from BetterCrypto/revert-80-master