db stuff
Merge pull request #14 from orodio/db

db stuff