Removed local references
Version bump
Merge branch 'master' into cws