Updated for Laravel 4.2