fix bug on query timeout result
Merge pull request #1 from ericliang/master

fix bug on query timeout result
Merge branch 'master' into debian
update changelog
add vcs-fields
Fix licence-field in debian/copyright