Changes name to stop conflict
Merge branch 'master' into beta