Fixing bugs
Merge branch 'master' of https://github.com/KMassicotte/Spaceman