Merge branch 'release/0.2.0' into develop
Removed Octarine from dependencies
Resolved some conflicts