diff --git a/demos/haudio.html b/demos/haudio.html
index fbbe6f2..c10d6a2 100755
--- a/demos/haudio.html
+++ b/demos/haudio.html
@@ -129,7 +129,7 @@ <h2>hAudio Demo</h2>
 soundManager.url = '\/static\/soundmanager2_flash9.swf';
 soundManager.flashVersion = 9;
 soundManager.onload = function () {
-    new Playdar.Player(soundManager);
+    Playdar.setup_player(soundManager);
     Playdar.client.init();
 };
 
diff --git a/demos/search.html b/demos/search.html
index b00c181..653152c 100755
--- a/demos/search.html
+++ b/demos/search.html
@@ -250,7 +250,7 @@ <h3 style="margin: 10px 0 5px 0;">Search Results <span style="background-color:l
 soundManager.url = '\/static\/soundmanager2_flash9.swf';
 soundManager.flashVersion = 9;
 soundManager.onload = function () {
-    new Playdar.Player(soundManager);
+    Playdar.setup_player(soundManager);
     Playdar.client.init();
 };
 </script>
diff --git a/download/playdar_lastfm.user.js b/download/playdar_lastfm.user.js
index 231a29e..769462a 100644
--- a/download/playdar_lastfm.user.js
+++ b/download/playdar_lastfm.user.js
@@ -56,7 +56,7 @@ function setup_playdar () {
     soundManager.url = 'http://' + playdar_web_host + '/static/soundmanager2_flash9.swf';
     soundManager.flashVersion = 9;
     soundManager.onload = function () {
-        new Playdar.Player(soundManager);
+        Playdar.setup_player(soundManager);
         Playdar.client.init();
     };
 };
diff --git a/js.html b/js.html
index cebee5c..5ecd5b4 100755
--- a/js.html
+++ b/js.html
@@ -99,12 +99,12 @@ <h3>Streaming</h3>
 </code></pre>
 
 <p>
-    The Playdar library also has a built in wrapper for the <a href="http://www.schillmania.com/projects/soundmanager2/">SoundManager 2 audio library</a>, available through the <code>Playdar.player</code> module. Simply include the <code>soundmanager2.js</code> file, configure the global <code>soundManager</code> object it creates and pass it into the <code>Playdar.Player</code> constructor to initialise the <code>Playdar.player</code> module. (note case difference)
+    The Playdar library also has a built in wrapper for the <a href="http://www.schillmania.com/projects/soundmanager2/">SoundManager 2 audio library</a>, available through the <code>Playdar.player</code> module. Simply include the <code>soundmanager2.js</code> file, configure the global <code>soundManager</code> object it creates and pass it into the <code>Playdar.setup_player</code> function to initialise the <code>Playdar.player</code> module.
 </p>
 <pre><code>soundManager.url = '/path/to/soundmanager2_flash9.swf';
 soundManager.flashVersion = 9;
 soundManager.onload = function () {
-    new Playdar.Player(soundManager);
+    Playdar.setup_player(soundManager);
     Playdar.client.init();
 };
 </code></pre>
diff --git a/static/0.4-changes.txt b/static/0.4-changes.txt
index 41d1b1b..8861961 100644
--- a/static/0.4-changes.txt
+++ b/static/0.4-changes.txt
@@ -7,7 +7,7 @@ playdar.init();
 
 Use this:
 Playdar.setup();
-new Playdar.Player(soundManager);
+Playdar.setup_player(soundManager);
 Playdar.client.init();
 
 Soundmanager wrapper in player namespace now
diff --git a/static/playdar.js b/static/playdar.js
index 3312480..81af032 100644
--- a/static/playdar.js
+++ b/static/playdar.js
@@ -17,6 +17,9 @@ Playdar = {
     player: null,
     setup: function (auth_details) {
         Playdar.client = new Playdar.Client(auth_details);
+    },
+    setup_player: function (soundmanager) {
+        Playdar.player = new Playdar.Player(soundmanager);
     }
 };
 
@@ -385,8 +388,6 @@ Playdar.Player = function (soundmanager) {
     this.streams = {};
     this.nowplayingid = null;
     this.soundmanager = soundmanager;
-    
-    Playdar.player = this;
 };
 Playdar.Player.prototype = {
     register_stream: function (result, options) {
diff --git a/static/tracks.js b/static/tracks.js
index c61937a..ba0841c 100644
--- a/static/tracks.js
+++ b/static/tracks.js
@@ -126,7 +126,7 @@ PlaydarTracks = {
         soundManager.url = '/static/soundmanager2_flash9.swf';
         soundManager.flashVersion = 9;
         soundManager.onload = function () {
-            new Playdar.Player(soundManager);
+            Playdar.setup_player(soundManager);
             Playdar.client.init();
         };
     },