Merge pull request #1 from astaxie/master

Merge pull request #418 from fuxiaohei/master