Merge pull request #55 from ChrisBoesch/master

update
Merge pull request #354 from ruijunhuang2010/master

Merge pull request #55 from ChrisBoesch/master