Merge branch 'release/0.1.0'
Merge branch 'release/0.2.0'
Version bump
Removed Octarine from dependencies
Resolved some conflicts
Merge branch 'master' into develop

Conflicts:
	Gemfile.lock