Merge branch 'master' into 'master'

fix #58 + limiting database to really supported types

See merge request !20
2 jobs for master in 4 minutes and 6 seconds (queued for 1 second)