Merge pull request #1 from wujg/master

yeah
c