#3: added in database changes
Merge pull request #10 from rhsu/database

#3: added in database changes