Merge pull request #46 from ChrisBoesch/master

update
Merge pull request #195 from ruijunhuang2010/master

Merge pull request #46 from ChrisBoesch/master