Merge with fork

Merging with fork for updated Octane Instances. Still getting a hang of pull requests on Github.