Merge pull request #32 from ChrisBoesch/master

update
Merge pull request #33 from ChrisBoesch/master

update
Merge pull request #34 from ChrisBoesch/master

update
Merge pull request #35 from ChrisBoesch/master

update
Merge pull request #50 from ruijunhuang2010/master

update