Database for test and production fixes #17
Merge pull request #18 from vircung/feature/test-database

Database for test and production fixes #17