Merge pull request #50 from winstonho/master

update
update
Merge pull request #20 from huanzhz/master

ai m