improve TrackerChecking
Merge pull request #490 from LipuFei/improve-trackerchecking

Improve TrackerChecking