Merge pull request #2 from Antidote/master

Bring Orion up to date
Merge pull request #3 from Antidote/master

* Fix broken commit
Merge pull request #1 from DragonSpiritIndustries/master

Sync with master