Merge pull request #32 from ruijunhuang2010/master

update
try pass the test
Merge pull request #19 from ChrisBoesch/master

update