Merge pull request #4 from ChrisBoesch/master

Merge pull request #204 from ruijunhuang2010/master
Merge pull request #205 from ruijunhuang2010/master

Merge pull request #4 from ChrisBoesch/master