Merge pull request #16 from ChrisBoesch/master

update
Merge pull request #409 from ruijunhuang2010/master

Merge pull request #16 from ChrisBoesch/master