tracking fixes
Merge pull request #2 from kcpac/development

tracking fixes