Merge pull request #807 from TheBlueMatt/bip21