Merge pull request #44 from ChrisBoesch/master

up to date
change icon
Merge pull request #187 from ruijunhuang2010/master

change icon