Working on db issue
Merge pull request #31 from RTakes/master

Working on db issue