Update in order to support Laravel 4.2

Some changes in order to support Laravel 4.2