Clean up
Add support for Laravel 5