merge db 32
Merge pull request #48 from DVLGroup/branch-47

merge db 32