fixing task timeout issue, and adding cancel method
Merge pull request #135 from kengoodhope/master

fixing task timeout issue, and adding cancel method