added string res
Merge branch 'master' of github.com:xiaobai/Nickelheim