Merge pull request #1 from laravel/master

update