fixes and update
Merge branch 'master' of https://github.com/mardawi/WalletMonitor