Merge pull request #228 from ruijunhuang2010/master

update
Merge pull request #229 from ruijunhuang2010/master

update
Merge pull request #15 from ChrisBoesch/master

update