Updated to work with Laravel 4.1