Merge pull request #17 from huanzhz/master

m
update
Merge pull request #45 from winstonho/master

update