Merge branch 'issue-16-db-support'

3 jobs for test in 5 minutes and 47 seconds (queued for 1 second)