Merge pull request #41 from winstonho/master

update
update
Merge pull request #16 from huanzhz/master

jump