Quick Fix to 'Tracking' Class Method
Merge branch 'dev'