Fixed "timeout" option is deprecated issue.
Support both array and comma separated string as arguments.
Update query test file
Update timeout option for query test file
Merge pull request #13 from maxtrunk/master

Fix and Update