Refactoring DB initialization
Merge pull request #213 from tmandzak/development

Refactoring DB initialization