fixes
Merge pull request #35 from dyoachim/tracks

fixes