Fix my problems
Merge branch 'master' of github.com:fitzgerlard/gnarcars