Merge pull request #352 from pgreyson/master

Add explicit timeout logic to recover if the API misbehaves