Code optimization
Merge branch 'master' of https://github.com/emmea90/tracks