Merge pull request #1 from astaxie/master

Merging