diff --git a/examples/callback.html b/examples/callback.html
new file mode 100644
index 0000000..abd5dbe
--- /dev/null
+++ b/examples/callback.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <title></title>
+  <script type='text/javascript'>//<![CDATA[
+  window.onload=function(){
+    var target = window.self === window.top ? window.opener : window.parent;
+
+    var hash = window.location.hash;
+    if (hash) {
+        var token = window.location.hash.split('&')[0].split('=')[1];
+        // target.postMessage(token, 'http://example.com/');
+        localStorage.setItem('spotify-token', token);
+    }
+
+  }//]]>
+
+  </script>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/examples/index.html b/examples/index.html
index 815c214..ff06ebc 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html ng-app="example">
+<html ng-app="exampleApp">
 <head>
   <title>angular-spotify demo!</title>
   <style>
diff --git a/examples/main.controller.js b/examples/main.controller.js
index 9ce0983..1402cbd 100644
--- a/examples/main.controller.js
+++ b/examples/main.controller.js
@@ -1,9 +1,8 @@
 angular
-  .module('example', ['spotify'])
+  .module('exampleApp', ['spotify'])
   .config(function (SpotifyProvider) {
-    console.log(SpotifyProvider);
-    SpotifyProvider.setClientId('123456789');
-    SpotifyProvider.setRedirectUri('http://www.example.com/callback.html');
+    SpotifyProvider.setClientId('123456789123456789');
+    SpotifyProvider.setRedirectUri('http://example.com/callback.html');
     SpotifyProvider.setScope('playlist-read-private');
   })
   .controller('MainController', ['$scope', 'Spotify', function ($scope, Spotify) {
@@ -15,7 +14,10 @@ angular
     };
 
     $scope.login = function () {
-      Spotify.login();
+      Spotify.login().then(function (data) {
+        console.log(data);
+        alert("You are now logged in");
+      })
     };
 
     // Gets an album
diff --git a/src/angular-spotify.js b/src/angular-spotify.js
index 05911cf..2903fca 100644
--- a/src/angular-spotify.js
+++ b/src/angular-spotify.js
@@ -383,20 +383,24 @@
           var authWindow = window.open(
             'https://accounts.spotify.com/authorize?' + this.toQueryString(params),
             'Spotify',
-            'menubar=no,location=no,resizable=no,scrollbars=no,status=no,width=' + w + ',height=' + h + ',top=' + top + ',left=' + left
+            'menubar=no,location=no,resizable=yes,scrollbars=yes,status=no,width=' + w + ',height=' + h + ',top=' + top + ',left=' + left
           );
 
-          function receiveMessage (event) {
-            if (authWindow) {
-              authWindow.close();
-            }
+          function storageChanged (e) {
+            if (e.key === 'spotify-token') {
+              if (authWindow) {
+                authWindow.close();
+              }
 
-            that.setAuthToken(event.data);
+              that.setAuthToken(e.newValue);
+              $window.removeEventListener('storage', storageChanged, false);
+              localStorage.removeItem('spotify-token');
 
-            deferred.resolve(event.data);
+              deferred.resolve(event.data);
+            }
           }
 
-          $window.addEventListener('message', receiveMessage, false);
+          $window.addEventListener('storage', storageChanged, false);
 
           return deferred.promise;
         };
