updated for laravel 4.2