refactored prefix of DB
Merge remote-tracking branch 'upstream/master'