Minor code changes
Merge branch 'master' of https://github.com/BusTrack/bustrack