Formatted using default tabs (against my greatest wishes).
Merge branch 'master' of github.com:Flyclops/GoCM