modify codes to fit new database.
Merge pull request #7 from cooee-zen/suyu_issue3

modify codes to fit new database.