diff --git a/composer.json b/composer.json
index 5e346385..a7282b61 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.4.0",
         "ext-curl": "*",
-        "illuminate/support": "4.2.*"
+        "illuminate/support": "5.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"
diff --git a/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php b/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php
index cb0f79c2..fe967901 100644
--- a/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php
+++ b/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php
@@ -19,15 +19,17 @@ class AmazonMwsServiceProvider extends ServiceProvider {
 	 */
 	public function register()
 	{
-		//
+		$configPath = __DIR__ . '/../../config/amazon-mws.php';
+		$this->mergeConfigFrom($configPath, 'amazon-mws');
+        
+		$this->app->alias('AmazonOrderList', 'Creacoon\AmazonMws\AmazonOrderList');
+		$this->app->alias('AmazonOrderItemList', 'Creacoon\AmazonMws\AmazonOrderItemList');
 	}
 
 	public function boot()
 	{
-		$this->package('creacoon/amazon-mws');
-
-		AliasLoader::getInstance()->alias('AmazonOrderList', 'Creacoon\AmazonMws\AmazonOrderList');
-		AliasLoader::getInstance()->alias('AmazonOrderItemList', 'Creacoon\AmazonMws\AmazonOrderItemList');
+		$configPath = __DIR__ . '/../../config/amazon-mws.php';
+        	$this->publishes([$configPath => config_path('amazon-mws.php')], 'config');
 	}
 
 	/**
diff --git a/src/Creacoon/AmazonMws/environment.php b/src/Creacoon/AmazonMws/environment.php
index 93732d62..ac558cb2 100644
--- a/src/Creacoon/AmazonMws/environment.php
+++ b/src/Creacoon/AmazonMws/environment.php
@@ -84,4 +84,5 @@
 //Getting a Feed
 $THROTTLE_LIMIT_FEEDRESULT = 15;
 $THROTTLE_TIME_FEEDRESULT = 60;
-?>
\ No newline at end of file
+
+?>
diff --git a/src/config/config.php b/src/config/amazon-mws
similarity index 98%
rename from src/config/config.php
rename to src/config/amazon-mws
index 464fcf06..2f4b6dbd 100644
--- a/src/config/config.php
+++ b/src/config/amazon-mws
@@ -14,4 +14,4 @@
 	'AMAZON_SERVICE_URL' => 'https://mws-eu.amazonservices.com/',
 
 	'muteLog' => false
-];
\ No newline at end of file
+];