Updated for Laravel 4.1