Merge pull request #19 from ChrisBoesch/master

update
Merge pull request #33 from ruijunhuang2010/master

update