timeout fix
make timeout configurable, use server.timeout instead of server.setTimeout
small change
Merge branch 'bstst-timeout'
1.1.2