Orbit feature.
Clean up.
Fix comments.
Merge pull request #33 from lagoa/mrafsan/feature/orbit

Mrafsan/feature/orbit