New branch + db setup
Merge pull request #2 from dmozina/master

Pull request for DB