added programmatic db generation, added indices to db
Merge remote-tracking branch 'upstream/master'