Fix issue 291 and changed DB schema
Merge pull request #324 from olga-jane/Protsenko_bugfixes

Fix issue 291 and changed DB schema (create file instead of migration)