Amending this commit because I screwed it up...
Merge branch 'master' of https://github.com/cjsauer/StarQuake