added function get_databasename
fixed error
Merge branch 'master' into bb
Fixed some problems in design