Bringing up-to-date
Merge branch 'master' of https://github.com/nkornek/Spaceship