Updated for laravel 4.1