fix for issue #330 - transactions and balances don't show up
Merge remote-tracking branch 'upstream/develop'