Merge pull request #28 from huanzhz/master

mFire
firework
Merge pull request #64 from winstonho/master

update