Some updates
Merge branch 'develop' of https://github.com/tshafer/orion into develop