Merge pull request #1 from wayonglee/master

database
fix merge