Getting accounts not only by type, but also by currency.
Merge origin/master