Merge pull request #788 from chuajiesheng/master

Bug Fix for rapidftr/tracker#127