Updated to work with laravel 4.1