Merge pull request #27 from ChrisBoesch/master

update
Merge pull request #28 from ChrisBoesch/master

update
Merge pull request #41 from ruijunhuang2010/master

update