Fix laravel 5 compatibility

Fixes #16. Lets review together. I'll make any adjustments before its ready to be merged.