mostly circular logic
Merge branch 'master' of https://github.com/Ideae/OrbIt