string changed
Merge branch 'new'
merged by sloan