fix namespace
add DatabaseObject
Merge origin/master