test timeout fix
Merge pull request #2 from tianmo/master

test timeout fix