Preparation for the upcoming Laravel 5. Fixes #29