147 - tracker updates
Merge pull request #291 from gsn/master

147 - tracker updates