Primary hopefully fixed.
Merge branch 'master' of https://github.com/laevar/jupiter