Merge pull request #253 from bergundy/master

add query timeout feature
fix docs for per query timeout