db variable fixed
Merge branch 'db_name'