diff --git a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json
index 83b8ad2..fb0c438 100644
--- a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -33,41 +33,62 @@
       "minimum-system-version" : "7.0",
       "scale" : "2x"
     },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "filename" : "TX6sV-2.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
       "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "TX6sV-1.png",
+      "extent" : "full-screen",
       "subtype" : "retina4",
       "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-1.png b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-1.png
new file mode 100644
index 0000000..20c7652
Binary files /dev/null and b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-1.png differ
diff --git a/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-2.png b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-2.png
new file mode 100644
index 0000000..20c7652
Binary files /dev/null and b/ExampleApp/ExampleApp/Images.xcassets/LaunchImage.launchimage/TX6sV-2.png differ
diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h
index e4dd707..5c268ef 100644
--- a/StreamingKit/StreamingKit/STKAudioPlayer.h
+++ b/StreamingKit/StreamingKit/STKAudioPlayer.h
@@ -44,7 +44,7 @@
 #include "UIKit/UIApplication.h"
 #endif
 
-typedef enum
+typedef NS_OPTIONS(NSInteger, STKAudioPlayerState)
 {
     STKAudioPlayerStateReady,
     STKAudioPlayerStateRunning = 1,
@@ -54,10 +54,9 @@ typedef enum
     STKAudioPlayerStateStopped = (1 << 4),
     STKAudioPlayerStateError = (1 << 5),
     STKAudioPlayerStateDisposed = (1 << 6)
-}
-STKAudioPlayerState;
+};
 
-typedef enum
+typedef NS_ENUM(NSInteger, STKAudioPlayerStopReason)
 {
 	STKAudioPlayerStopReasonNone = 0,
 	STKAudioPlayerStopReasonEof,
@@ -65,10 +64,9 @@ typedef enum
 	STKAudioPlayerStopReasonPendingNext,
 	STKAudioPlayerStopReasonDisposed,
 	STKAudioPlayerStopReasonError = 0xffff
-}
-STKAudioPlayerStopReason;
+};
 
-typedef enum
+typedef NS_ENUM(NSInteger, STKAudioPlayerErrorCode)
 {
 	STKAudioPlayerErrorNone = 0,
 	STKAudioPlayerErrorDataSource,
@@ -77,8 +75,7 @@ typedef enum
     STKAudioPlayerErrorCodecError,
     STKAudioPlayerErrorDataNotFound,
     STKAudioPlayerErrorOther = 0xffff
-}
-STKAudioPlayerErrorCode;
+};
 
 ///
 /// Options to initiailise the Audioplayer with.