changes to Database lib class
Merge origin/master