timeout-bug-fixed
Merge pull request #30 from mike1729/master

Some timeout bug fixed