Add missing connector parameter
add some tests
add tests for 'explain'
Merge branch 'master' into client