adding db_server flag
added db_name parameter to config
merged in master