db stuff
Merge pull request #15 from wawiwa/develop

db stuff