TDD: 1, Me: 0
Merge branch 'master' of github.com:maxstauss/gtr