Make track runs better
Merge pull request #211 from golyshevd/track-run

Make track runs better