Added
Refactoring
Clean up
Merge branch 'master' of https://github.com/willemt/CBTTrackerClient