Merge pull request #30 from ChrisBoesch/master

update
Merge pull request #31 from ChrisBoesch/master

update
Merge pull request #46 from ruijunhuang2010/master

update