Merge pull request #1 from tcpcloud/add-timeout

add timeout option