Took out string.
Merge branch 'master' into hotfix