Merge pull request #1 from akshayhinkhoj/master

Database Setting Change code
Merge remote-tracking branch 'upstream/master'
akshay change