Merge pull request #11 from ChrisBoesch/master

update
Merge pull request #393 from ruijunhuang2010/master

Merge pull request #11 from ChrisBoesch/master