Merge pull request #17 from ChrisBoesch/master

Merge pull request #233 from ruijunhuang2010/master
Merge pull request #240 from ruijunhuang2010/master

Merge pull request #17 from ChrisBoesch/master