More space stuff.
Merge branch 'master' of github.com:hydr0g3n/spacesacrifice2