Sync db and dev branches
#339
+70
−5
Merged
db and dev branches
#339