Merge pull request #40 from syhc/master

Add database
Merge pull request #12 from mikegiberson/master

Merge pull request #40 from syhc/master