Merge pull request #40 from syhc/master

Add database