Merge pull request #858 from jkczyz/2021-03-electrum-interface