Fixing db load
Merge pull request #312 from einhverfr/1.3

Fixing db load
Merge pull request #76 from ledgersmb/1.3

sync over 1.3 branch