Merge pull request #19 from herbatnik/master

Database Ready ! :D
fix for services