Merge develop into master v0.2.6