fixed new to be a string
Merge branch 'master' into develop