Fixing ORI bugs
`
Merge pull request #49 from cgoodling/kaley

Fixing ORI bugs