Update haha1
Merge pull request #19 from yyexplore/master

tijiao