fix bug
String->string
Merge branch 'master' of https://github.com/ihenria/3202g2