Merge pull request #289 from ruijunhuang2010/master

Merge pull request #35 from ChrisBoesch/master
Merge pull request #36 from ChrisBoesch/master

Merge pull request #289 from ruijunhuang2010/master