Merge branch 'master' of https://git.bettercrypto.org/ach-master into theory-rewrite