diff --git a/Audjustable.podspec b/Audjustable.podspec
index d930772..26d228b 100644
--- a/Audjustable.podspec
+++ b/Audjustable.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = "Audjustable"
-  s.version      = "0.0.2"
+  s.version      = "0.0.3"
   s.summary      = "A fast and extensible audio streamer for iOS and OSX with support for gapless playback and custom (non-HTTP) sources."
   s.homepage     = "http://tumtumtum.github.com/audjustable/"
   s.license      = 'MIT'
   s.author       = { "Thong Nguyen" => "tumtumtum@gmail.com" }
-  s.source       = { :git => "https://github.com/gangverk/audjustable.git", :tag => s.version.to_s}
+  s.source       = { :git => "https://github.com/tumtumtum/audjustable.git", :tag => s.version.to_s}
   s.platform     = :ios
   s.requires_arc = true
   s.source_files = 'Audjustable/Classes/AudioPlayer/*.{h,m}'
diff --git a/Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme b/Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme
new file mode 100644
index 0000000..62da42b
--- /dev/null
+++ b/Audjustable.xcodeproj/xcshareddata/xcschemes/Audjustable Test Project.xcscheme	
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A186B4DE157F80E600BD0084"
+               BuildableName = "Audjustable.app"
+               BlueprintName = "Audjustable"
+               ReferencedContainer = "container:Audjustable.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A186B4DE157F80E600BD0084"
+            BuildableName = "Audjustable.app"
+            BlueprintName = "Audjustable"
+            ReferencedContainer = "container:Audjustable.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A186B4DE157F80E600BD0084"
+            BuildableName = "Audjustable.app"
+            BlueprintName = "Audjustable"
+            ReferencedContainer = "container:Audjustable.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A186B4DE157F80E600BD0084"
+            BuildableName = "Audjustable.app"
+            BlueprintName = "Audjustable"
+            ReferencedContainer = "container:Audjustable.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme b/Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme
new file mode 100644
index 0000000..9b91159
--- /dev/null
+++ b/Audjustable.xcodeproj/xcshareddata/xcschemes/audjustable static library.xcscheme	
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8AC7AD4616E55CD70069BDE7"
+               BuildableName = "libaudjustable.a"
+               BlueprintName = "audjustable"
+               ReferencedContainer = "container:Audjustable.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Audjustable/Classes/AudioPlayer/AudioPlayer.m b/Audjustable/Classes/AudioPlayer/AudioPlayer.m
index 94a47c2..797f185 100644
--- a/Audjustable/Classes/AudioPlayer/AudioPlayer.m
+++ b/Audjustable/Classes/AudioPlayer/AudioPlayer.m
@@ -1410,7 +1410,11 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
         
         if (currentlyReadingEntry == nil)
         {
-            self.internalState = AudioPlayerInternalStateStopping;
+			if (upcomingQueue.count == 0)
+			{
+				stopReason = AudioPlayerStopReasonNoStop;
+				self.internalState = AudioPlayerInternalStateStopping;
+			}
         }
         
         if (nextIsDifferent && entry)
diff --git a/Audjustable/Classes/AudioPlayer/HttpDataSource.m b/Audjustable/Classes/AudioPlayer/HttpDataSource.m
index 9c482b1..2839743 100644
--- a/Audjustable/Classes/AudioPlayer/HttpDataSource.m
+++ b/Audjustable/Classes/AudioPlayer/HttpDataSource.m
@@ -107,7 +107,7 @@
     {
         CFTypeRef copyPropertyMessage = CFReadStreamCopyProperty(stream, kCFStreamPropertyHTTPResponseHeader);
         
-        httpHeaders = (__bridge NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)copyPropertyMessage);
+        httpHeaders = (__bridge_transfer NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)copyPropertyMessage);
         
         CFRelease(copyPropertyMessage);