Review code for possible merge

https://github.com/steemit/wallet/pull/140 https://github.com/steemit/wallet/pull/141