Jon: Does not look half shitty tbh
Merge branch 'master' of github.com:astromoose/crucible