Updated ormy
Adjustments for Gold CLI
Merge pull request #31 from zerious/master

Adjustments to facilitate Gold CLI