Merge pull request #15 from wawiwa/develop

db stuff
Merge remote-tracking branch 'base/master' into develop