Testing with timeout
Merge pull request #4 from dmitrydwhite/tian

Testing with timeout