Merge branch 'master' into develop
version bump
some typo fixes