Octopus 2 package change
Merge pull request #30 from richard-green/development

Octopus 2 package change - DO NOT MERGE