Merge pull request #113 from kapetan/upstream

Fix query included in database name
v0.9.11
Normalize callback arguments. Same as shell.