Merge branch 'tracker'
Merge branch 'master' of https://github.com/vsalgado/Bycler