Do a little tweak to improve string builder
Merge remote branch 'origin/master'
Some little modification
Small refactor
Merge pull request #1 from gckjdev/master

update