merged from master
Merge branch 'electrum' of github.com:ewg118/numishare into electrum