Merge pull request #14 from ChrisBoesch/master

update
separate tag with comma
Merge pull request #228 from ruijunhuang2010/master

update