Enhanced tracking code
Merge pull request #7 from strength-hub/develop

Enhanced tracking code