Add default values
Merge branch 'master' into db-table-refactoring
Merge pull request #202 from axsh/db-table-refactoring

Db table refactoring