Merge branch 'develop' and version bump