Major Overhaul of the Engie sat: Take three

http://i.imgur.com/CwEjbAk.png
Merge pull request #31 from fj45/master

Major Overhaul of the Engie sat: Take three