(bug) pull data from db
Merge pull request #77 from sjsharp/master

(bug) pull data from db