Merge pull request #15 from pcockwell/master

Fixing gree/Orion#14 and gree/Orion#10