diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index bea850d..afcb51f 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -88,5 +88,13 @@
   "cancel": {
     "message": "Cancel",
     "description": ""
+  },
+  "clearData": {
+    "message": "Clear all data",
+    "description": ""
+  },
+  "clearDataText": {
+    "message": "If you have some troubles with the extension, you can clear all it's stored data here.",
+    "description": ""
   }
 }
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 63dd6a3..a235611 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -88,5 +88,13 @@
   "cancel": {
     "message": "Annuler",
     "description": ""
+  },
+  "clearData": {
+    "message": "Effacer toutes les données",
+    "description": ""
+  },
+  "clearDataText": {
+    "message": "Si vous avez des problèmes avec l'extension, vous pouvez effacer toutes les données enregistrées ici.",
+    "description": ""
   }
 }
diff --git a/manifest.json b/manifest.json
index cc82c70..d38c3df 100755
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Shazam2Spotify",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "manifest_version": 2,
   "description": "__MSG_appDesc__",
   "homepage_url": "http://www.leeroy.me",
diff --git a/package.json b/package.json
index 2d66b06..0d1546a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chrome-shazam2spotify",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "author": "Leeroy Brun <leeroy.brun@batiplus.ch>",
   "private": true,
   "description": "Chrome extension used to export your Shazam tags to a Spotify playlist",
diff --git a/popup/partials/settings.html b/popup/partials/settings.html
index d09a190..45c5f04 100644
--- a/popup/partials/settings.html
+++ b/popup/partials/settings.html
@@ -74,4 +74,9 @@ <h3>Spotify</h3>
 			<p><a class="pure-button button-warning" ng-click="spotify.disconnect()" chrome-translate>logout</a></p>
 		</div>
 	</div>
+	<div class="advanced-settings">
+		<h3 chrome-translate>clearData</h3>
+		<p chrome-translate>clearDataText</p>
+		<p><a class="pure-button pure-button-warning" ng-click="resetAll()" chrome-translate>clearData</a></p>
+	</div>
 </div>
\ No newline at end of file
diff --git a/src/popup/js/controllers/SettingsCtrl.js b/src/popup/js/controllers/SettingsCtrl.js
index fda72cb..b47e6d5 100644
--- a/src/popup/js/controllers/SettingsCtrl.js
+++ b/src/popup/js/controllers/SettingsCtrl.js
@@ -28,6 +28,11 @@ angular.module('Shazam2Spotify').controller('SettingsCtrl', function($scope, $lo
 		$scope.spotify.loginStatus = status;
 	});
 
+	$scope.resetAll = function() {
+		chrome.storage.local.clear();
+		chrome.storage.sync.clear();
+	};
+
 	$scope.return = function() {
 		$location.path('/');
 	};