Updating README and bumping version
Merge branch 'master' into custom