Merge pull request #11 from ChrisBoesch/master

Merge pull request #219 from ruijunhuang2010/master
Merge pull request #220 from ruijunhuang2010/master

Merge pull request #11 from ChrisBoesch/master