ready for testing
Merge branch 'master' of https://github.com/pf4d/space_simulator