MagicTorch, fist revisions
Merge branch 'master' of https://github.com/Ideae/OrbIt