Fixed merge conflicts
Fixes #2
Merge branch 'iss2' of https://github.com/swilli/jupiter_tour into iss2