TME-28 Stopping tracking
Merge pull request #76 from SachinFulcrum/TME-28

TME-28 Stopping tracking