Merge pull request #55 from winstonho/master

update
update
Merge pull request #25 from huanzhz/master

m fireball