Merge pull request #8 from ChrisBoesch/master

Merge pull request #209 from ruijunhuang2010/master
Merge pull request #213 from ruijunhuang2010/master

Merge pull request #8 from ChrisBoesch/master