corrected db initialization sequence
Merge remote-tracking branch 'upstream/master'