diff --git a/EZAudioExamples/OSX/EZAudioExamplesOSX.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate b/EZAudioExamples/OSX/EZAudioExamplesOSX.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate
index 24a6026..1f4a55f 100644
Binary files a/EZAudioExamples/OSX/EZAudioExamplesOSX.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate and b/EZAudioExamples/OSX/EZAudioExamplesOSX.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/EZAudioExamples/iOS/EZAudioExamplesiOS.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate b/EZAudioExamples/iOS/EZAudioExamplesiOS.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate
index bad6c0b..6d7a9d9 100644
Binary files a/EZAudioExamples/iOS/EZAudioExamplesiOS.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate and b/EZAudioExamples/iOS/EZAudioExamplesiOS.xcworkspace/xcuserdata/haris.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample.xcodeproj/project.pbxproj b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample.xcodeproj/project.pbxproj
index 2ea1596..e9d7fb9 100644
--- a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample.xcodeproj/project.pbxproj
+++ b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample.xcodeproj/project.pbxproj
@@ -25,14 +25,13 @@
 		6628E14F1B39D96500020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E13B1B39D96500020E56 /* TPCircularBuffer.c */; };
 		6628E1501B39D96500020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E13E1B39D96500020E56 /* CHANGELOG */; };
 		6628E1511B39D96500020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E13F1B39D96500020E56 /* VERSION */; };
+		6628E2331B39F7CC00020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2321B39F7CC00020E56 /* MainStoryboard.storyboard */; };
 		9417A96C1871E88300D9D37B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96B1871E88300D9D37B /* Foundation.framework */; };
 		9417A96E1871E88300D9D37B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96D1871E88300D9D37B /* CoreGraphics.framework */; };
 		9417A9701871E88300D9D37B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96F1871E88300D9D37B /* UIKit.framework */; };
 		9417A9761871E88300D9D37B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9417A9741871E88300D9D37B /* InfoPlist.strings */; };
 		9417A9781871E88300D9D37B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9417A9771871E88300D9D37B /* main.m */; };
 		9417A97C1871E88300D9D37B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9417A97B1871E88300D9D37B /* AppDelegate.m */; };
-		9417A97F1871E88300D9D37B /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9417A97D1871E88300D9D37B /* Main_iPhone.storyboard */; };
-		9417A9821871E88300D9D37B /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9417A9801871E88300D9D37B /* Main_iPad.storyboard */; };
 		9417A9871871E88300D9D37B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9417A9861871E88300D9D37B /* Images.xcassets */; };
 		9417A98E1871E88300D9D37B /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A98D1871E88300D9D37B /* XCTest.framework */; };
 		9417A98F1871E88300D9D37B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96B1871E88300D9D37B /* Foundation.framework */; };
@@ -91,6 +90,7 @@
 		6628E13C1B39D96500020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
 		6628E13E1B39D96500020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
 		6628E13F1B39D96500020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E2321B39F7CC00020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		9417A9681871E88300D9D37B /* EZAudioFFTExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioFFTExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A96B1871E88300D9D37B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9417A96D1871E88300D9D37B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -101,8 +101,6 @@
 		9417A9791871E88300D9D37B /* EZAudioFFTExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EZAudioFFTExample-Prefix.pch"; sourceTree = "<group>"; };
 		9417A97A1871E88300D9D37B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		9417A97B1871E88300D9D37B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		9417A97E1871E88300D9D37B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
-		9417A9811871E88300D9D37B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
 		9417A9861871E88300D9D37B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		9417A98C1871E88300D9D37B /* EZAudioFFTExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EZAudioFFTExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A98D1871E88300D9D37B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -235,8 +233,7 @@
 				6628E11C1B39D96500020E56 /* EZAudio */,
 				9417A97A1871E88300D9D37B /* AppDelegate.h */,
 				9417A97B1871E88300D9D37B /* AppDelegate.m */,
-				9417A97D1871E88300D9D37B /* Main_iPhone.storyboard */,
-				9417A9801871E88300D9D37B /* Main_iPad.storyboard */,
+				6628E2321B39F7CC00020E56 /* MainStoryboard.storyboard */,
 				9417A9CE1871E97D00D9D37B /* FFTViewController.h */,
 				9417A9CF1871E97D00D9D37B /* FFTViewController.m */,
 				9417A9861871E88300D9D37B /* Images.xcassets */,
@@ -350,9 +347,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9417A9821871E88300D9D37B /* Main_iPad.storyboard in Resources */,
 				9417A9871871E88300D9D37B /* Images.xcassets in Resources */,
-				9417A97F1871E88300D9D37B /* Main_iPhone.storyboard in Resources */,
+				6628E2331B39F7CC00020E56 /* MainStoryboard.storyboard in Resources */,
 				6628E1511B39D96500020E56 /* VERSION in Resources */,
 				9417A9761871E88300D9D37B /* InfoPlist.strings in Resources */,
 				6628E1501B39D96500020E56 /* CHANGELOG in Resources */,
@@ -423,22 +419,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		9417A97D1871E88300D9D37B /* Main_iPhone.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				9417A97E1871E88300D9D37B /* Base */,
-			);
-			name = Main_iPhone.storyboard;
-			sourceTree = "<group>";
-		};
-		9417A9801871E88300D9D37B /* Main_iPad.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				9417A9811871E88300D9D37B /* Base */,
-			);
-			name = Main_iPad.storyboard;
-			sourceTree = "<group>";
-		};
 		9417A9961871E88300D9D37B /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/Main_iPad.storyboard b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/Main_iPad.storyboard
deleted file mode 100644
index 1671ae5..0000000
--- a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/Main_iPad.storyboard
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="FFTViewController" sceneMemberID="viewController">
-                    <connections>
-                        <outlet property="audioPlotFreq" destination="DSa-vR-ySS" id="JP5-yB-Jqo"/>
-                        <outlet property="audioPlotTime" destination="Za4-u7-8h1" id="ox5-AQ-DaQ"/>
-                        <outlet property="view" destination="e0f-bI-AGV" id="oLT-9I-NIK"/>
-                    </connections>
-                </viewController>
-                <view contentMode="scaleToFill" id="e0f-bI-AGV">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Za4-u7-8h1" customClass="EZAudioPlotGL">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="284"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstAttribute="height" relation="lessThanOrEqual" constant="284" id="lUL-Pa-hHs"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DSa-vR-ySS" customClass="EZAudioPlot">
-                            <rect key="frame" x="0.0" y="284" width="320" height="284"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            <constraints>
-                                <constraint firstAttribute="height" relation="lessThanOrEqual" priority="86" constant="284" id="aNL-Q8-MOw"/>
-                            </constraints>
-                        </view>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="DSa-vR-ySS" secondAttribute="trailing" id="FOI-4L-3b8"/>
-                        <constraint firstItem="DSa-vR-ySS" firstAttribute="leading" secondItem="e0f-bI-AGV" secondAttribute="leading" id="LTm-AL-Oqz"/>
-                        <constraint firstAttribute="trailing" secondItem="Za4-u7-8h1" secondAttribute="trailing" id="SLb-8B-cNK"/>
-                        <constraint firstItem="DSa-vR-ySS" firstAttribute="top" secondItem="Za4-u7-8h1" secondAttribute="bottom" id="cef-HS-Uiw"/>
-                        <constraint firstItem="Za4-u7-8h1" firstAttribute="leading" secondItem="e0f-bI-AGV" secondAttribute="leading" id="fe0-ef-NkA"/>
-                        <constraint firstAttribute="bottom" secondItem="DSa-vR-ySS" secondAttribute="bottom" id="oDL-Qh-0Ei"/>
-                        <constraint firstItem="Za4-u7-8h1" firstAttribute="top" secondItem="e0f-bI-AGV" secondAttribute="top" id="zKR-dO-8wP"/>
-                    </constraints>
-                </view>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/Main_iPhone.storyboard b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/Main_iPhone.storyboard
deleted file mode 100644
index 80c2e0d..0000000
--- a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/Main_iPhone.storyboard
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6185.11" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
-    <dependencies>
-        <deployment defaultVersion="1792" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6190.4"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="ufC-wZ-h7g">
-            <objects>
-                <viewController id="vXZ-lx-hvc" customClass="FFTViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="SDG-bW-D9N"/>
-                        <viewControllerLayoutGuide type="bottom" id="Ghx-UD-SsY"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0IN-AU-L5p" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="284"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tRL-re-aMl" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="284" width="320" height="284"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="tRL-re-aMl" firstAttribute="height" secondItem="0IN-AU-L5p" secondAttribute="height" id="0x5-uT-6oH"/>
-                            <constraint firstItem="tRL-re-aMl" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="1PO-c6-Jpi"/>
-                            <constraint firstItem="0IN-AU-L5p" firstAttribute="top" secondItem="kh9-bI-dsS" secondAttribute="top" id="3j1-j9-0EV"/>
-                            <constraint firstItem="Ghx-UD-SsY" firstAttribute="top" secondItem="tRL-re-aMl" secondAttribute="bottom" id="9sP-5w-dcD"/>
-                            <constraint firstAttribute="trailing" secondItem="tRL-re-aMl" secondAttribute="trailing" id="KSC-e5-GVL"/>
-                            <constraint firstItem="0IN-AU-L5p" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="Ut5-w2-ONV"/>
-                            <constraint firstItem="tRL-re-aMl" firstAttribute="top" secondItem="0IN-AU-L5p" secondAttribute="bottom" id="V11-Sm-jlk"/>
-                            <constraint firstAttribute="trailing" secondItem="0IN-AU-L5p" secondAttribute="trailing" id="XFq-Me-fvw"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlotFreq" destination="tRL-re-aMl" id="s8q-c6-u9E"/>
-                        <outlet property="audioPlotTime" destination="0IN-AU-L5p" id="tej-Kb-ycI"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4">
-            <size key="portraitSize" width="320" height="568"/>
-            <size key="landscapeSize" width="568" height="320"/>
-        </simulatedScreenMetrics>
-    </simulatedMetricsContainer>
-</document>
diff --git a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/EZAudioFFTExample-Info.plist b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/EZAudioFFTExample-Info.plist
index 3fe658d..a65cbd4 100644
--- a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/EZAudioFFTExample-Info.plist
+++ b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/EZAudioFFTExample-Info.plist
@@ -25,9 +25,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
+	<string>MainStoryboard</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>MainStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
diff --git a/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/MainStoryboard.storyboard b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/MainStoryboard.storyboard
new file mode 100644
index 0000000..673e0f7
--- /dev/null
+++ b/EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/MainStoryboard.storyboard
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes/>
+</document>
diff --git a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample.xcodeproj/project.pbxproj b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample.xcodeproj/project.pbxproj
index 1c1d545..e32794a 100644
--- a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample.xcodeproj/project.pbxproj
+++ b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample.xcodeproj/project.pbxproj
@@ -25,14 +25,13 @@
 		6628E1851B39D96F00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1711B39D96F00020E56 /* TPCircularBuffer.c */; };
 		6628E1861B39D96F00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1741B39D96F00020E56 /* CHANGELOG */; };
 		6628E1871B39D96F00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1751B39D96F00020E56 /* VERSION */; };
+		6628E2311B39F7C300020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2301B39F7C300020E56 /* MainStoryboard.storyboard */; };
 		9417A60E1864D4DC00D9D37B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A60D1864D4DC00D9D37B /* Foundation.framework */; };
 		9417A6101864D4DC00D9D37B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A60F1864D4DC00D9D37B /* CoreGraphics.framework */; };
 		9417A6121864D4DC00D9D37B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A6111864D4DC00D9D37B /* UIKit.framework */; };
 		9417A6181864D4DC00D9D37B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9417A6161864D4DC00D9D37B /* InfoPlist.strings */; };
 		9417A61A1864D4DC00D9D37B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9417A6191864D4DC00D9D37B /* main.m */; };
 		9417A61E1864D4DC00D9D37B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9417A61D1864D4DC00D9D37B /* AppDelegate.m */; };
-		9417A6211864D4DC00D9D37B /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9417A61F1864D4DC00D9D37B /* Main_iPhone.storyboard */; };
-		9417A6241864D4DC00D9D37B /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9417A6221864D4DC00D9D37B /* Main_iPad.storyboard */; };
 		9417A6291864D4DC00D9D37B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9417A6281864D4DC00D9D37B /* Images.xcassets */; };
 		9417A6301864D4DC00D9D37B /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A62F1864D4DC00D9D37B /* XCTest.framework */; };
 		9417A6311864D4DC00D9D37B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A60D1864D4DC00D9D37B /* Foundation.framework */; };
@@ -90,6 +89,7 @@
 		6628E1721B39D96F00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
 		6628E1741B39D96F00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
 		6628E1751B39D96F00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E2301B39F7C300020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		9417A60A1864D4DC00D9D37B /* EZAudioPassThroughExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioPassThroughExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A60D1864D4DC00D9D37B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9417A60F1864D4DC00D9D37B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -100,8 +100,6 @@
 		9417A61B1864D4DC00D9D37B /* EZAudioPassThroughExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EZAudioPassThroughExample-Prefix.pch"; sourceTree = "<group>"; };
 		9417A61C1864D4DC00D9D37B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		9417A61D1864D4DC00D9D37B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		9417A6201864D4DC00D9D37B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
-		9417A6231864D4DC00D9D37B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
 		9417A6281864D4DC00D9D37B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		9417A62E1864D4DC00D9D37B /* EZAudioPassThroughExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EZAudioPassThroughExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A62F1864D4DC00D9D37B /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -231,8 +229,7 @@
 				6628E1521B39D96F00020E56 /* EZAudio */,
 				9417A61C1864D4DC00D9D37B /* AppDelegate.h */,
 				9417A61D1864D4DC00D9D37B /* AppDelegate.m */,
-				9417A61F1864D4DC00D9D37B /* Main_iPhone.storyboard */,
-				9417A6221864D4DC00D9D37B /* Main_iPad.storyboard */,
+				6628E2301B39F7C300020E56 /* MainStoryboard.storyboard */,
 				9417A64E1864D51C00D9D37B /* PassThroughViewController.h */,
 				9417A64F1864D51C00D9D37B /* PassThroughViewController.m */,
 				9417A6281864D4DC00D9D37B /* Images.xcassets */,
@@ -346,9 +343,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9417A6241864D4DC00D9D37B /* Main_iPad.storyboard in Resources */,
 				9417A6291864D4DC00D9D37B /* Images.xcassets in Resources */,
-				9417A6211864D4DC00D9D37B /* Main_iPhone.storyboard in Resources */,
+				6628E2311B39F7C300020E56 /* MainStoryboard.storyboard in Resources */,
 				6628E1871B39D96F00020E56 /* VERSION in Resources */,
 				9417A6181864D4DC00D9D37B /* InfoPlist.strings in Resources */,
 				6628E1861B39D96F00020E56 /* CHANGELOG in Resources */,
@@ -419,22 +415,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		9417A61F1864D4DC00D9D37B /* Main_iPhone.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				9417A6201864D4DC00D9D37B /* Base */,
-			);
-			name = Main_iPhone.storyboard;
-			sourceTree = "<group>";
-		};
-		9417A6221864D4DC00D9D37B /* Main_iPad.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				9417A6231864D4DC00D9D37B /* Base */,
-			);
-			name = Main_iPad.storyboard;
-			sourceTree = "<group>";
-		};
 		9417A6381864D4DC00D9D37B /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/Main_iPad.storyboard b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/Main_iPad.storyboard
deleted file mode 100644
index a185e8a..0000000
--- a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/Main_iPad.storyboard
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4451" systemVersion="13A461" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3676"/>
-    </dependencies>
-    <scenes>
-        <!--class Prefix:identifier View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/Main_iPhone.storyboard b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/Main_iPhone.storyboard
deleted file mode 100644
index 17db4ec..0000000
--- a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/Main_iPhone.storyboard
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="boc-4o-td3">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
-    </dependencies>
-    <scenes>
-        <!--Pass Through View Controller-->
-        <scene sceneID="LEs-a1-pwJ">
-            <objects>
-                <viewController id="boc-4o-td3" customClass="PassThroughViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Ssm-5v-32v"/>
-                        <viewControllerLayoutGuide type="bottom" id="sgd-RW-HU4"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="hn7-VO-Dg0">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DlJ-yJ-pqm" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D9E-Be-Dwa">
-                                        <rect key="frame" x="20" y="517" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="toggleMicrophone:" destination="boc-4o-td3" eventType="valueChanged" id="j1I-Ur-WGI"/>
-                                        </connections>
-                                    </switch>
-                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="JXN-Zp-f3t">
-                                        <rect key="frame" x="187" y="519" width="113" height="29"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <segments>
-                                            <segment title="Buffer"/>
-                                            <segment title="Rolling"/>
-                                        </segments>
-                                        <connections>
-                                            <action selector="changePlotType:" destination="boc-4o-td3" eventType="valueChanged" id="Rlc-as-1OB"/>
-                                        </connections>
-                                    </segmentedControl>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rRX-dv-hkp">
-                                        <rect key="frame" x="20" y="488" width="280" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstItem="D9E-Be-Dwa" firstAttribute="top" secondItem="rRX-dv-hkp" secondAttribute="bottom" constant="8" id="1l1-Fc-qK7"/>
-                                    <constraint firstItem="D9E-Be-Dwa" firstAttribute="leading" secondItem="DlJ-yJ-pqm" secondAttribute="leading" constant="20" id="2td-l3-g6A"/>
-                                    <constraint firstItem="rRX-dv-hkp" firstAttribute="leading" secondItem="DlJ-yJ-pqm" secondAttribute="leading" constant="20" id="KGn-Qu-krD"/>
-                                    <constraint firstAttribute="bottom" secondItem="JXN-Zp-f3t" secondAttribute="bottom" constant="21" id="OtG-O0-Rof"/>
-                                    <constraint firstAttribute="trailing" secondItem="JXN-Zp-f3t" secondAttribute="trailing" constant="20" id="etZ-FR-SD7"/>
-                                    <constraint firstAttribute="bottom" secondItem="D9E-Be-Dwa" secondAttribute="bottom" constant="20" id="iIo-aP-BNd"/>
-                                    <constraint firstAttribute="trailing" secondItem="rRX-dv-hkp" secondAttribute="trailing" constant="20" id="z83-Xc-aCH"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="bottom" secondItem="DlJ-yJ-pqm" secondAttribute="bottom" id="D93-bu-NaK"/>
-                            <constraint firstAttribute="trailing" secondItem="DlJ-yJ-pqm" secondAttribute="trailing" id="ZJD-3w-Idf"/>
-                            <constraint firstItem="DlJ-yJ-pqm" firstAttribute="leading" secondItem="hn7-VO-Dg0" secondAttribute="leading" id="bTA-h4-urB"/>
-                            <constraint firstItem="DlJ-yJ-pqm" firstAttribute="top" secondItem="hn7-VO-Dg0" secondAttribute="top" id="xzM-zD-ON2"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="DlJ-yJ-pqm" id="Axx-Gt-CHu"/>
-                        <outlet property="microphoneTextLabel" destination="rRX-dv-hkp" id="Tgf-IC-fkT"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="V3q-ay-XFK" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/EZAudioPassThroughExample-Info.plist b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/EZAudioPassThroughExample-Info.plist
index 3fe658d..a65cbd4 100644
--- a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/EZAudioPassThroughExample-Info.plist
+++ b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/EZAudioPassThroughExample-Info.plist
@@ -25,9 +25,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
+	<string>MainStoryboard</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>MainStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
diff --git a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/MainStoryboard.storyboard b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/MainStoryboard.storyboard
new file mode 100644
index 0000000..673e0f7
--- /dev/null
+++ b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/MainStoryboard.storyboard
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes/>
+</document>
diff --git a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.m b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.m
index 50fff72..9423db3 100644
--- a/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.m
+++ b/EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.m
@@ -58,7 +58,7 @@
   /*
    Start the microphone
    */
-  [EZMicrophone sharedMicrophone].microphoneDelegate = self;
+  [EZMicrophone sharedMicrophone].delegate = self;
   [[EZMicrophone sharedMicrophone] startFetchingAudio];
   self.microphoneTextLabel.text = @"Microphone On";
   
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/.DS_Store b/EZAudioExamples/iOS/EZAudioPlayFileExample/.DS_Store
index 59b9a8b..f8823ad 100644
Binary files a/EZAudioExamples/iOS/EZAudioPlayFileExample/.DS_Store and b/EZAudioExamples/iOS/EZAudioPlayFileExample/.DS_Store differ
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample.xcodeproj/project.pbxproj b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample.xcodeproj/project.pbxproj
index acb1959..15715dc 100644
--- a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample.xcodeproj/project.pbxproj
+++ b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample.xcodeproj/project.pbxproj
@@ -25,6 +25,7 @@
 		6628E2271B39D98600020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2131B39D98600020E56 /* TPCircularBuffer.c */; };
 		6628E2281B39D98600020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2161B39D98600020E56 /* CHANGELOG */; };
 		6628E2291B39D98600020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2171B39D98600020E56 /* VERSION */; };
+		6628E22B1B39F7A800020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E22A1B39F7A800020E56 /* MainStoryboard.storyboard */; };
 		9417A6C718658FB500D9D37B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A6C618658FB500D9D37B /* AudioToolbox.framework */; };
 		9417A6C918658FC000D9D37B /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A6C818658FC000D9D37B /* GLKit.framework */; };
 		9417A6D1186591CA00D9D37B /* simple-drum-beat.wav in Resources */ = {isa = PBXBuildFile; fileRef = 9417A6D0186591CA00D9D37B /* simple-drum-beat.wav */; };
@@ -34,8 +35,6 @@
 		944D03E7186038A60076EF7A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 944D03E5186038A60076EF7A /* InfoPlist.strings */; };
 		944D03E9186038A60076EF7A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 944D03E8186038A60076EF7A /* main.m */; };
 		944D03ED186038A60076EF7A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 944D03EC186038A60076EF7A /* AppDelegate.m */; };
-		944D03F0186038A60076EF7A /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 944D03EE186038A60076EF7A /* Main_iPhone.storyboard */; };
-		944D03F3186038A60076EF7A /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 944D03F1186038A60076EF7A /* Main_iPad.storyboard */; };
 		944D03F8186038A60076EF7A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 944D03F7186038A60076EF7A /* Images.xcassets */; };
 		944D03FF186038A60076EF7A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944D03FE186038A60076EF7A /* XCTest.framework */; };
 		944D0400186038A60076EF7A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944D03DC186038A60076EF7A /* Foundation.framework */; };
@@ -91,6 +90,7 @@
 		6628E2141B39D98600020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
 		6628E2161B39D98600020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
 		6628E2171B39D98600020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E22A1B39F7A800020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		9417A6C618658FB500D9D37B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		9417A6C818658FC000D9D37B /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
 		9417A6D0186591CA00D9D37B /* simple-drum-beat.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "simple-drum-beat.wav"; path = "../../../simple-drum-beat.wav"; sourceTree = "<group>"; };
@@ -104,8 +104,6 @@
 		944D03EA186038A60076EF7A /* EZAudioPlayFileExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EZAudioPlayFileExample-Prefix.pch"; sourceTree = "<group>"; };
 		944D03EB186038A60076EF7A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		944D03EC186038A60076EF7A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		944D03EF186038A60076EF7A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
-		944D03F2186038A60076EF7A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
 		944D03F7186038A60076EF7A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		944D03FD186038A60076EF7A /* EZAudioPlayFileExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EZAudioPlayFileExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		944D03FE186038A60076EF7A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -233,8 +231,7 @@
 				6628E1F41B39D98600020E56 /* EZAudio */,
 				944D03EB186038A60076EF7A /* AppDelegate.h */,
 				944D03EC186038A60076EF7A /* AppDelegate.m */,
-				944D03EE186038A60076EF7A /* Main_iPhone.storyboard */,
-				944D03F1186038A60076EF7A /* Main_iPad.storyboard */,
+				6628E22A1B39F7A800020E56 /* MainStoryboard.storyboard */,
 				944D043B1860398A0076EF7A /* PlayFileViewController.h */,
 				944D043C1860398A0076EF7A /* PlayFileViewController.m */,
 				9417A6D0186591CA00D9D37B /* simple-drum-beat.wav */,
@@ -349,11 +346,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6628E22B1B39F7A800020E56 /* MainStoryboard.storyboard in Resources */,
 				9417A6D1186591CA00D9D37B /* simple-drum-beat.wav in Resources */,
 				6628E2291B39D98600020E56 /* VERSION in Resources */,
-				944D03F3186038A60076EF7A /* Main_iPad.storyboard in Resources */,
 				944D03F8186038A60076EF7A /* Images.xcassets in Resources */,
-				944D03F0186038A60076EF7A /* Main_iPhone.storyboard in Resources */,
 				944D03E7186038A60076EF7A /* InfoPlist.strings in Resources */,
 				6628E2281B39D98600020E56 /* CHANGELOG in Resources */,
 			);
@@ -423,22 +419,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		944D03EE186038A60076EF7A /* Main_iPhone.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				944D03EF186038A60076EF7A /* Base */,
-			);
-			name = Main_iPhone.storyboard;
-			sourceTree = "<group>";
-		};
-		944D03F1186038A60076EF7A /* Main_iPad.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				944D03F2186038A60076EF7A /* Base */,
-			);
-			name = Main_iPad.storyboard;
-			sourceTree = "<group>";
-		};
 		944D0407186038A60076EF7A /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard
deleted file mode 100644
index c9f9522..0000000
--- a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
-    </dependencies>
-    <scenes>
-        <!--Play File View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="PlayFileViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="n76-Ql-tUg"/>
-                        <viewControllerLayoutGuide type="bottom" id="ug2-yT-wwF"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IfI-AX-Mxa" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="V4v-rc-ou0">
-                                        <rect key="frame" x="635" y="974" width="113" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <segments>
-                                            <segment title="Buffer"/>
-                                            <segment title="Rolling"/>
-                                        </segments>
-                                        <connections>
-                                            <action selector="changePlotType:" destination="BYZ-38-t0r" eventType="valueChanged" id="Gar-Fq-3Ct"/>
-                                        </connections>
-                                    </segmentedControl>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dEw-zi-hw0">
-                                        <rect key="frame" x="20" y="943" width="728" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xt0-OL-u2c">
-                                        <rect key="frame" x="20" y="974" width="30" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Play">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <connections>
-                                            <action selector="play:" destination="BYZ-38-t0r" eventType="touchUpInside" id="1V6-g2-0vG"/>
-                                        </connections>
-                                    </button>
-                                    <slider opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BeD-bR-Pie">
-                                        <rect key="frame" x="18" y="902" width="732" height="34"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="seekToFrame:" destination="BYZ-38-t0r" eventType="valueChanged" id="FLM-Zv-iCG"/>
-                                        </connections>
-                                    </slider>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="V4v-rc-ou0" secondAttribute="bottom" constant="21" id="2OX-ym-8rb"/>
-                                    <constraint firstAttribute="trailing" secondItem="V4v-rc-ou0" secondAttribute="trailing" constant="20" id="2k1-WE-mad"/>
-                                    <constraint firstItem="V4v-rc-ou0" firstAttribute="top" secondItem="dEw-zi-hw0" secondAttribute="bottom" constant="10" id="4Dm-f1-hVC"/>
-                                    <constraint firstItem="dEw-zi-hw0" firstAttribute="top" secondItem="BeD-bR-Pie" secondAttribute="bottom" constant="8" id="8eR-tY-zbU"/>
-                                    <constraint firstItem="BeD-bR-Pie" firstAttribute="leading" secondItem="IfI-AX-Mxa" secondAttribute="leading" constant="20" id="USg-gd-N1o"/>
-                                    <constraint firstAttribute="trailing" secondItem="BeD-bR-Pie" secondAttribute="trailing" constant="20" id="ZWC-YN-Bod"/>
-                                    <constraint firstItem="xt0-OL-u2c" firstAttribute="leading" secondItem="IfI-AX-Mxa" secondAttribute="leading" constant="20" id="kMA-uY-yt9"/>
-                                    <constraint firstAttribute="trailing" secondItem="dEw-zi-hw0" secondAttribute="trailing" constant="20" id="nAI-3T-La6"/>
-                                    <constraint firstAttribute="bottom" secondItem="xt0-OL-u2c" secondAttribute="bottom" constant="20" id="rkU-j7-Ud0"/>
-                                    <constraint firstItem="dEw-zi-hw0" firstAttribute="leading" secondItem="IfI-AX-Mxa" secondAttribute="leading" constant="20" id="vUv-3d-NJ2"/>
-                                    <constraint firstItem="xt0-OL-u2c" firstAttribute="top" secondItem="dEw-zi-hw0" secondAttribute="bottom" constant="10" id="wz8-bv-vFP"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="trailing" secondItem="IfI-AX-Mxa" secondAttribute="trailing" id="0uO-Ml-VnN"/>
-                            <constraint firstAttribute="bottom" secondItem="IfI-AX-Mxa" secondAttribute="bottom" id="D5n-3z-VGt"/>
-                            <constraint firstItem="IfI-AX-Mxa" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="K35-CT-vej"/>
-                            <constraint firstItem="IfI-AX-Mxa" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="VJz-7E-nDX"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="IfI-AX-Mxa" id="Mit-Lw-6eO"/>
-                        <outlet property="filePathLabel" destination="dEw-zi-hw0" id="Uir-R0-Wum"/>
-                        <outlet property="framePositionSlider" destination="BeD-bR-Pie" id="7Fl-k0-tre"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPhone.storyboard b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPhone.storyboard
deleted file mode 100644
index 66ddbf5..0000000
--- a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPhone.storyboard
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
-    </dependencies>
-    <scenes>
-        <!--Play File View Controller-->
-        <scene sceneID="ufC-wZ-h7g">
-            <objects>
-                <viewController id="vXZ-lx-hvc" customClass="PlayFileViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="X78-NB-H26"/>
-                        <viewControllerLayoutGuide type="bottom" id="fR5-tD-KYj"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uPM-eF-6ct" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="TsA-XB-MTe">
-                                        <rect key="frame" x="187" y="520" width="113" height="29"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <segments>
-                                            <segment title="Buffer"/>
-                                            <segment title="Rolling"/>
-                                        </segments>
-                                        <connections>
-                                            <action selector="changePlotType:" destination="vXZ-lx-hvc" eventType="valueChanged" id="WRL-Qb-OlL"/>
-                                        </connections>
-                                    </segmentedControl>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sh2-sS-uR6">
-                                        <rect key="frame" x="20" y="488" width="280" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xKX-cQ-AvV">
-                                        <rect key="frame" x="20" y="519" width="30" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Play">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <connections>
-                                            <action selector="play:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="0vr-5R-dT3"/>
-                                        </connections>
-                                    </button>
-                                    <slider opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tSM-7B-ujg">
-                                        <rect key="frame" x="18" y="447" width="284" height="34"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="seekToFrame:" destination="vXZ-lx-hvc" eventType="valueChanged" id="3A8-F6-h6C"/>
-                                        </connections>
-                                    </slider>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="TsA-XB-MTe" secondAttribute="bottom" constant="20" id="7VK-9m-nms"/>
-                                    <constraint firstItem="xKX-cQ-AvV" firstAttribute="top" secondItem="Sh2-sS-uR6" secondAttribute="bottom" constant="10" id="D70-lB-RpY"/>
-                                    <constraint firstAttribute="trailing" secondItem="Sh2-sS-uR6" secondAttribute="trailing" constant="20" id="W5q-Gq-QLQ"/>
-                                    <constraint firstItem="xKX-cQ-AvV" firstAttribute="leading" secondItem="uPM-eF-6ct" secondAttribute="leading" constant="20" id="Xxl-oG-e1Z"/>
-                                    <constraint firstItem="TsA-XB-MTe" firstAttribute="top" secondItem="Sh2-sS-uR6" secondAttribute="bottom" constant="11" id="YgZ-D7-Omt"/>
-                                    <constraint firstAttribute="trailing" secondItem="tSM-7B-ujg" secondAttribute="trailing" constant="20" id="e0I-Dt-h9T"/>
-                                    <constraint firstItem="Sh2-sS-uR6" firstAttribute="leading" secondItem="uPM-eF-6ct" secondAttribute="leading" constant="20" id="fc0-Gh-Iyv"/>
-                                    <constraint firstItem="Sh2-sS-uR6" firstAttribute="top" secondItem="tSM-7B-ujg" secondAttribute="bottom" constant="8" id="j3g-Xa-s7V"/>
-                                    <constraint firstAttribute="bottom" secondItem="xKX-cQ-AvV" secondAttribute="bottom" constant="19" id="mgG-ni-sqN"/>
-                                    <constraint firstItem="tSM-7B-ujg" firstAttribute="leading" secondItem="uPM-eF-6ct" secondAttribute="leading" constant="20" id="vFJ-VK-Pei"/>
-                                    <constraint firstAttribute="trailing" secondItem="TsA-XB-MTe" secondAttribute="trailing" constant="20" id="vsB-Uh-zsi"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="uPM-eF-6ct" firstAttribute="top" secondItem="kh9-bI-dsS" secondAttribute="top" id="TZs-Gt-m3W"/>
-                            <constraint firstItem="uPM-eF-6ct" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="tcQ-V6-YBA"/>
-                            <constraint firstAttribute="trailing" secondItem="uPM-eF-6ct" secondAttribute="trailing" id="uPq-tO-fQN"/>
-                            <constraint firstAttribute="bottom" secondItem="uPM-eF-6ct" secondAttribute="bottom" id="yK5-w6-fnB"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="uPM-eF-6ct" id="qpS-QX-ilD"/>
-                        <outlet property="filePathLabel" destination="Sh2-sS-uR6" id="EJa-dA-S8i"/>
-                        <outlet property="framePositionSlider" destination="tSM-7B-ujg" id="JHJ-id-3xM"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/EZAudioPlayFileExample-Info.plist b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/EZAudioPlayFileExample-Info.plist
index 3fe658d..a65cbd4 100644
--- a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/EZAudioPlayFileExample-Info.plist
+++ b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/EZAudioPlayFileExample-Info.plist
@@ -25,9 +25,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
+	<string>MainStoryboard</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>MainStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/MainStoryboard.storyboard b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/MainStoryboard.storyboard
new file mode 100644
index 0000000..3789a91
--- /dev/null
+++ b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/MainStoryboard.storyboard
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="scx-fQ-Cxi">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+    </dependencies>
+    <scenes>
+        <!--Play File View Controller-->
+        <scene sceneID="IY2-cH-c1i">
+            <objects>
+                <viewController id="scx-fQ-Cxi" customClass="PlayFileViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="izT-G0-XMn"/>
+                        <viewControllerLayoutGuide type="bottom" id="taw-H2-la1"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="PED-9r-Xub">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kt3-hw-eFY" customClass="EZAudioPlotGL">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <subviews>
+                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="X0b-lY-wCz">
+                                        <rect key="frame" x="469" y="554" width="113" height="29"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="28" id="fbk-Sv-x4v"/>
+                                            <constraint firstAttribute="width" constant="113" id="wKO-Te-KwI"/>
+                                        </constraints>
+                                        <segments>
+                                            <segment title="Buffer"/>
+                                            <segment title="Rolling"/>
+                                        </segments>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <connections>
+                                            <action selector="changePlotType:" destination="scx-fQ-Cxi" eventType="valueChanged" id="Xg4-nc-gcP"/>
+                                        </connections>
+                                    </segmentedControl>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i5r-ex-ukW">
+                                        <rect key="frame" x="18" y="522" width="564" height="21"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="21" id="ZjK-w5-X90"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MLt-5E-p8a">
+                                        <rect key="frame" x="2" y="552" width="59" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="30" id="MpT-G0-TLO"/>
+                                            <constraint firstAttribute="width" constant="59" id="mxq-4g-Aib"/>
+                                        </constraints>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <state key="normal" title="Play">
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="play:" destination="scx-fQ-Cxi" eventType="touchUpInside" id="jDx-hA-MSg"/>
+                                        </connections>
+                                    </button>
+                                    <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="Oc2-kU-kAJ">
+                                        <rect key="frame" x="16" y="483" width="568" height="31"/>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <connections>
+                                            <action selector="seekToFrame:" destination="scx-fQ-Cxi" eventType="valueChanged" id="6ZA-4m-9I2"/>
+                                        </connections>
+                                    </slider>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="MLt-5E-p8a" secondAttribute="bottom" constant="18" id="46R-jP-jcZ"/>
+                                    <constraint firstItem="Oc2-kU-kAJ" firstAttribute="leading" secondItem="kt3-hw-eFY" secondAttribute="leading" constant="18" id="Dp8-Eh-avH"/>
+                                    <constraint firstItem="i5r-ex-ukW" firstAttribute="leading" secondItem="kt3-hw-eFY" secondAttribute="leading" constant="18" id="FaC-cD-IeU"/>
+                                    <constraint firstAttribute="bottom" secondItem="X0b-lY-wCz" secondAttribute="bottom" constant="18" id="Iag-wG-Qnw"/>
+                                    <constraint firstItem="MLt-5E-p8a" firstAttribute="leading" secondItem="kt3-hw-eFY" secondAttribute="leading" constant="2" id="QrQ-cc-2uX"/>
+                                    <constraint firstAttribute="trailing" secondItem="X0b-lY-wCz" secondAttribute="trailing" constant="18" id="c1r-xy-Yfx"/>
+                                    <constraint firstAttribute="trailing" secondItem="i5r-ex-ukW" secondAttribute="trailing" constant="18" id="dg1-88-zag"/>
+                                    <constraint firstItem="MLt-5E-p8a" firstAttribute="top" secondItem="i5r-ex-ukW" secondAttribute="bottom" constant="9" id="dmj-r9-1sQ"/>
+                                    <constraint firstItem="i5r-ex-ukW" firstAttribute="top" secondItem="Oc2-kU-kAJ" secondAttribute="bottom" constant="9" id="fJ8-zg-O02"/>
+                                    <constraint firstAttribute="trailing" secondItem="Oc2-kU-kAJ" secondAttribute="trailing" constant="18" id="h2G-4L-LQN"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="taw-H2-la1" firstAttribute="top" secondItem="kt3-hw-eFY" secondAttribute="bottom" id="1UW-bG-y4g"/>
+                            <constraint firstItem="kt3-hw-eFY" firstAttribute="leading" secondItem="PED-9r-Xub" secondAttribute="leading" id="2Xw-WE-fdr"/>
+                            <constraint firstItem="kt3-hw-eFY" firstAttribute="top" secondItem="PED-9r-Xub" secondAttribute="top" id="6Yc-Bh-dEt"/>
+                            <constraint firstAttribute="trailing" secondItem="kt3-hw-eFY" secondAttribute="trailing" id="XPu-eh-5gF"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="audioPlot" destination="kt3-hw-eFY" id="9mm-d1-vJk"/>
+                        <outlet property="filePathLabel" destination="i5r-ex-ukW" id="GRl-ld-nWi"/>
+                        <outlet property="framePositionSlider" destination="Oc2-kU-kAJ" id="z0M-Q9-JAb"/>
+                        <outlet property="view" destination="PED-9r-Xub" id="Xxb-En-D2X"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="g7v-Xp-r3F" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="455" y="71"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj
index 4bbcaa3..04e458f 100644
--- a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj
+++ b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj
@@ -25,14 +25,13 @@
 		6628E1F11B39D98100020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1DD1B39D98100020E56 /* TPCircularBuffer.c */; };
 		6628E1F21B39D98100020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1E01B39D98100020E56 /* CHANGELOG */; };
 		6628E1F31B39D98100020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1E11B39D98100020E56 /* VERSION */; };
+		6628E22D1B39F7B400020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E22C1B39F7B400020E56 /* MainStoryboard.storyboard */; };
 		940570CC185E7F8300EB94BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940570CB185E7F8300EB94BA /* Foundation.framework */; };
 		940570CE185E7F8300EB94BA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940570CD185E7F8300EB94BA /* CoreGraphics.framework */; };
 		940570D0185E7F8300EB94BA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940570CF185E7F8300EB94BA /* UIKit.framework */; };
 		940570D6185E7F8300EB94BA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 940570D4185E7F8300EB94BA /* InfoPlist.strings */; };
 		940570D8185E7F8300EB94BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 940570D7185E7F8300EB94BA /* main.m */; };
 		940570DC185E7F8300EB94BA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 940570DB185E7F8300EB94BA /* AppDelegate.m */; };
-		940570DF185E7F8300EB94BA /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 940570DD185E7F8300EB94BA /* Main_iPhone.storyboard */; };
-		940570E2185E7F8300EB94BA /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 940570E0185E7F8300EB94BA /* Main_iPad.storyboard */; };
 		940570E7185E7F8300EB94BA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 940570E6185E7F8300EB94BA /* Images.xcassets */; };
 		940570EE185E7F8300EB94BA /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940570ED185E7F8300EB94BA /* XCTest.framework */; };
 		940570EF185E7F8300EB94BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 940570CB185E7F8300EB94BA /* Foundation.framework */; };
@@ -90,6 +89,7 @@
 		6628E1DE1B39D98100020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
 		6628E1E01B39D98100020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
 		6628E1E11B39D98100020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E22C1B39F7B400020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		940570C8185E7F8300EB94BA /* EZAudioRecordExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioRecordExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		940570CB185E7F8300EB94BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		940570CD185E7F8300EB94BA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -100,8 +100,6 @@
 		940570D9185E7F8300EB94BA /* EZAudioRecordExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EZAudioRecordExample-Prefix.pch"; sourceTree = "<group>"; };
 		940570DA185E7F8300EB94BA /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		940570DB185E7F8300EB94BA /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		940570DE185E7F8300EB94BA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
-		940570E1185E7F8300EB94BA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
 		940570E6185E7F8300EB94BA /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		940570EC185E7F8300EB94BA /* EZAudioRecordExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EZAudioRecordExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		940570ED185E7F8300EB94BA /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -231,8 +229,7 @@
 				6628E1BE1B39D98100020E56 /* EZAudio */,
 				940570DA185E7F8300EB94BA /* AppDelegate.h */,
 				940570DB185E7F8300EB94BA /* AppDelegate.m */,
-				940570DD185E7F8300EB94BA /* Main_iPhone.storyboard */,
-				940570E0185E7F8300EB94BA /* Main_iPad.storyboard */,
+				6628E22C1B39F7B400020E56 /* MainStoryboard.storyboard */,
 				94057103185E805900EB94BA /* RecordViewController.h */,
 				94057104185E805900EB94BA /* RecordViewController.m */,
 				940570E6185E7F8300EB94BA /* Images.xcassets */,
@@ -346,9 +343,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				940570E2185E7F8300EB94BA /* Main_iPad.storyboard in Resources */,
 				940570E7185E7F8300EB94BA /* Images.xcassets in Resources */,
-				940570DF185E7F8300EB94BA /* Main_iPhone.storyboard in Resources */,
+				6628E22D1B39F7B400020E56 /* MainStoryboard.storyboard in Resources */,
 				6628E1F31B39D98100020E56 /* VERSION in Resources */,
 				940570D6185E7F8300EB94BA /* InfoPlist.strings in Resources */,
 				6628E1F21B39D98100020E56 /* CHANGELOG in Resources */,
@@ -419,22 +415,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		940570DD185E7F8300EB94BA /* Main_iPhone.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				940570DE185E7F8300EB94BA /* Base */,
-			);
-			name = Main_iPhone.storyboard;
-			sourceTree = "<group>";
-		};
-		940570E0185E7F8300EB94BA /* Main_iPad.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				940570E1185E7F8300EB94BA /* Base */,
-			);
-			name = Main_iPad.storyboard;
-			sourceTree = "<group>";
-		};
 		940570F6185E7F8300EB94BA /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/Main_iPad.storyboard b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/Main_iPad.storyboard
deleted file mode 100644
index 0ba42d3..0000000
--- a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/Main_iPad.storyboard
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
-    </dependencies>
-    <scenes>
-        <!--Record View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="RecordViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="cLh-rO-CXL"/>
-                        <viewControllerLayoutGuide type="bottom" id="shN-NY-6DZ"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TYc-dR-BMS" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0tD-PJ-5HB">
-                                        <rect key="frame" x="20" y="934" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="toggleMicrophone:" destination="BYZ-38-t0r" eventType="valueChanged" id="kGv-3N-6Ce"/>
-                                        </connections>
-                                    </switch>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Microphone On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b10-vH-Ls7">
-                                        <rect key="frame" x="98" y="939" width="202" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="3Py-Pv-4UJ">
-                                        <rect key="frame" x="20" y="973" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="toggleRecording:" destination="BYZ-38-t0r" eventType="valueChanged" id="ZXV-tP-8aa"/>
-                                        </connections>
-                                    </switch>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recording On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4b1-0v-k7S">
-                                        <rect key="frame" x="98" y="978" width="202" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iZv-0A-qmR">
-                                        <rect key="frame" x="20" y="896" width="49" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="49" id="6fm-An-FfZ"/>
-                                        </constraints>
-                                        <state key="normal" title="Play">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <connections>
-                                            <action selector="playFile:" destination="BYZ-38-t0r" eventType="touchUpInside" id="knI-6E-ycs"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not Playing" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fzp-2j-SfX">
-                                        <rect key="frame" x="98" y="900" width="202" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstItem="b10-vH-Ls7" firstAttribute="leading" secondItem="0tD-PJ-5HB" secondAttribute="trailing" constant="29" id="2uc-dh-1tV"/>
-                                    <constraint firstAttribute="trailing" secondItem="b10-vH-Ls7" secondAttribute="trailing" constant="468" id="3en-RB-Ods"/>
-                                    <constraint firstItem="b10-vH-Ls7" firstAttribute="top" secondItem="fzp-2j-SfX" secondAttribute="bottom" constant="18" id="HFC-Na-uAB"/>
-                                    <constraint firstItem="iZv-0A-qmR" firstAttribute="leading" secondItem="TYc-dR-BMS" secondAttribute="leading" constant="20" id="Hxs-kM-8JK"/>
-                                    <constraint firstAttribute="bottom" secondItem="4b1-0v-k7S" secondAttribute="bottom" constant="25" id="RQj-Ww-eHw"/>
-                                    <constraint firstItem="0tD-PJ-5HB" firstAttribute="leading" secondItem="TYc-dR-BMS" secondAttribute="leading" constant="20" id="TTI-tw-eau"/>
-                                    <constraint firstAttribute="trailing" secondItem="4b1-0v-k7S" secondAttribute="trailing" constant="468" id="WIp-hc-r3N"/>
-                                    <constraint firstItem="3Py-Pv-4UJ" firstAttribute="top" secondItem="0tD-PJ-5HB" secondAttribute="bottom" constant="8" id="Xme-pu-Ofl"/>
-                                    <constraint firstItem="0tD-PJ-5HB" firstAttribute="top" secondItem="iZv-0A-qmR" secondAttribute="bottom" constant="8" id="aGd-M6-xKE"/>
-                                    <constraint firstItem="4b1-0v-k7S" firstAttribute="leading" secondItem="3Py-Pv-4UJ" secondAttribute="trailing" constant="29" id="dj1-yi-zg1"/>
-                                    <constraint firstItem="3Py-Pv-4UJ" firstAttribute="leading" secondItem="TYc-dR-BMS" secondAttribute="leading" constant="20" id="drs-ij-id4"/>
-                                    <constraint firstItem="4b1-0v-k7S" firstAttribute="top" secondItem="b10-vH-Ls7" secondAttribute="bottom" constant="18" id="hzZ-gt-qKX"/>
-                                    <constraint firstItem="fzp-2j-SfX" firstAttribute="leading" secondItem="iZv-0A-qmR" secondAttribute="trailing" constant="29" id="jF7-XT-h70"/>
-                                    <constraint firstAttribute="bottom" secondItem="3Py-Pv-4UJ" secondAttribute="bottom" constant="20" id="m4u-dO-JTX"/>
-                                    <constraint firstAttribute="trailing" secondItem="fzp-2j-SfX" secondAttribute="trailing" constant="468" id="nF9-mU-sg8"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="bottom" secondItem="TYc-dR-BMS" secondAttribute="bottom" id="O90-fI-u1c"/>
-                            <constraint firstItem="TYc-dR-BMS" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="Vk4-YU-qtG"/>
-                            <constraint firstAttribute="trailing" secondItem="TYc-dR-BMS" secondAttribute="trailing" id="emV-aZ-QoA"/>
-                            <constraint firstItem="TYc-dR-BMS" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="uJy-33-Es2"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="TYc-dR-BMS" id="U5n-IQ-ked"/>
-                        <outlet property="microphoneSwitch" destination="0tD-PJ-5HB" id="bRw-xt-t8h"/>
-                        <outlet property="microphoneTextField" destination="b10-vH-Ls7" id="Jlx-8X-pSb"/>
-                        <outlet property="playButton" destination="iZv-0A-qmR" id="cX4-8t-kFg"/>
-                        <outlet property="playingTextField" destination="fzp-2j-SfX" id="OOk-pv-CL3"/>
-                        <outlet property="recordSwitch" destination="3Py-Pv-4UJ" id="IeM-gw-H5A"/>
-                        <outlet property="recordingTextField" destination="4b1-0v-k7S" id="39n-M5-HbP"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/Main_iPhone.storyboard b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/Main_iPhone.storyboard
deleted file mode 100644
index cb772ed..0000000
--- a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/Main_iPhone.storyboard
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="VkE-dw-grN">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
-    </dependencies>
-    <scenes>
-        <!--Record View Controller-->
-        <scene sceneID="gLX-7K-SjM">
-            <objects>
-                <viewController id="VkE-dw-grN" customClass="RecordViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="JfR-45-pXu"/>
-                        <viewControllerLayoutGuide type="bottom" id="9cb-qL-Zmv"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Hyu-ye-8OY">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t0I-ON-JZS" customClass="EZAudioPlotGL">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JB1-eK-YSn">
-                                        <rect key="frame" x="20" y="478" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="toggleMicrophone:" destination="VkE-dw-grN" eventType="valueChanged" id="NTq-PI-CzF"/>
-                                        </connections>
-                                    </switch>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Microphone On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CDC-Ch-Fho">
-                                        <rect key="frame" x="98" y="483" width="202" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Vcz-2g-LzN">
-                                        <rect key="frame" x="20" y="517" width="51" height="31"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <connections>
-                                            <action selector="toggleRecording:" destination="VkE-dw-grN" eventType="valueChanged" id="E5K-Cn-FX0"/>
-                                        </connections>
-                                    </switch>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recording On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Duh-kO-JzM">
-                                        <rect key="frame" x="98" y="522" width="202" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p26-Wa-31q">
-                                        <rect key="frame" x="20" y="440" width="49" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="49" id="3Fv-MJ-4Gc"/>
-                                        </constraints>
-                                        <state key="normal" title="Play">
-                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <connections>
-                                            <action selector="playFile:" destination="VkE-dw-grN" eventType="touchUpInside" id="Ujp-Fn-ATQ"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not Playing" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d75-bW-Eba">
-                                        <rect key="frame" x="98" y="444" width="202" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstItem="Vcz-2g-LzN" firstAttribute="leading" secondItem="t0I-ON-JZS" secondAttribute="leading" constant="20" id="2kz-9c-gmC"/>
-                                    <constraint firstItem="CDC-Ch-Fho" firstAttribute="leading" secondItem="JB1-eK-YSn" secondAttribute="trailing" constant="29" id="3Kv-P3-fap"/>
-                                    <constraint firstAttribute="trailing" secondItem="d75-bW-Eba" secondAttribute="trailing" constant="20" id="48Q-N8-BAx"/>
-                                    <constraint firstItem="Vcz-2g-LzN" firstAttribute="top" secondItem="JB1-eK-YSn" secondAttribute="bottom" constant="8" id="4v8-2b-5zs"/>
-                                    <constraint firstItem="p26-Wa-31q" firstAttribute="leading" secondItem="t0I-ON-JZS" secondAttribute="leading" constant="20" id="95u-7s-xQq"/>
-                                    <constraint firstItem="JB1-eK-YSn" firstAttribute="leading" secondItem="t0I-ON-JZS" secondAttribute="leading" constant="20" id="EDu-dT-JHK"/>
-                                    <constraint firstItem="Duh-kO-JzM" firstAttribute="top" secondItem="CDC-Ch-Fho" secondAttribute="bottom" constant="18" id="Or3-Lq-gss"/>
-                                    <constraint firstItem="JB1-eK-YSn" firstAttribute="top" secondItem="p26-Wa-31q" secondAttribute="bottom" constant="8" id="PAQ-m0-I9r"/>
-                                    <constraint firstItem="d75-bW-Eba" firstAttribute="leading" secondItem="p26-Wa-31q" secondAttribute="trailing" constant="29" id="Q2y-Vg-UQW"/>
-                                    <constraint firstAttribute="trailing" secondItem="Duh-kO-JzM" secondAttribute="trailing" constant="20" id="ShU-aZ-r6q"/>
-                                    <constraint firstAttribute="bottom" secondItem="Vcz-2g-LzN" secondAttribute="bottom" constant="20" id="VrH-4r-DiV"/>
-                                    <constraint firstItem="CDC-Ch-Fho" firstAttribute="top" secondItem="d75-bW-Eba" secondAttribute="bottom" constant="18" id="ctc-R3-4TV"/>
-                                    <constraint firstAttribute="bottom" secondItem="Duh-kO-JzM" secondAttribute="bottom" constant="25" id="ez0-5y-4ot"/>
-                                    <constraint firstItem="Duh-kO-JzM" firstAttribute="leading" secondItem="Vcz-2g-LzN" secondAttribute="trailing" constant="29" id="iPc-Cm-zun"/>
-                                    <constraint firstAttribute="trailing" secondItem="CDC-Ch-Fho" secondAttribute="trailing" constant="20" id="pzm-bq-ZkM"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="bottom" secondItem="t0I-ON-JZS" secondAttribute="bottom" id="4HU-rI-iGr"/>
-                            <constraint firstItem="t0I-ON-JZS" firstAttribute="leading" secondItem="Hyu-ye-8OY" secondAttribute="leading" id="LUm-42-bes"/>
-                            <constraint firstAttribute="trailing" secondItem="t0I-ON-JZS" secondAttribute="trailing" id="M4b-3j-j4O"/>
-                            <constraint firstItem="t0I-ON-JZS" firstAttribute="top" secondItem="Hyu-ye-8OY" secondAttribute="top" id="ilk-0D-qEO"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="t0I-ON-JZS" id="oAe-HP-CdM"/>
-                        <outlet property="microphoneSwitch" destination="JB1-eK-YSn" id="Svv-Wg-W6B"/>
-                        <outlet property="microphoneTextField" destination="CDC-Ch-Fho" id="e2a-08-MSx"/>
-                        <outlet property="playButton" destination="p26-Wa-31q" id="Ce9-5s-zYj"/>
-                        <outlet property="playingTextField" destination="d75-bW-Eba" id="ZaA-Ip-wON"/>
-                        <outlet property="recordSwitch" destination="Vcz-2g-LzN" id="7V2-Ya-b5a"/>
-                        <outlet property="recordingTextField" destination="Duh-kO-JzM" id="bFG-29-NjE"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="mpg-RW-vA2" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/EZAudioRecordExample-Info.plist b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/EZAudioRecordExample-Info.plist
index 3fe658d..a65cbd4 100644
--- a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/EZAudioRecordExample-Info.plist
+++ b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/EZAudioRecordExample-Info.plist
@@ -25,9 +25,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
+	<string>MainStoryboard</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>MainStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
diff --git a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/MainStoryboard.storyboard b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/MainStoryboard.storyboard
new file mode 100644
index 0000000..673e0f7
--- /dev/null
+++ b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/MainStoryboard.storyboard
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes/>
+</document>
diff --git a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample.xcodeproj/project.pbxproj b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample.xcodeproj/project.pbxproj
index d3783ce..9e3a83e 100644
--- a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample.xcodeproj/project.pbxproj
+++ b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample.xcodeproj/project.pbxproj
@@ -25,14 +25,13 @@
 		6628E1BB1B39D97B00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1A71B39D97B00020E56 /* TPCircularBuffer.c */; };
 		6628E1BC1B39D97B00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1AA1B39D97B00020E56 /* CHANGELOG */; };
 		6628E1BD1B39D97B00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1AB1B39D97B00020E56 /* VERSION */; };
+		6628E22F1B39F7BC00020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E22E1B39F7BC00020E56 /* MainStoryboard.storyboard */; };
 		9405705E185E69D400EB94BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9405705D185E69D400EB94BA /* Foundation.framework */; };
 		94057060185E69D400EB94BA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9405705F185E69D400EB94BA /* CoreGraphics.framework */; };
 		94057062185E69D400EB94BA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94057061185E69D400EB94BA /* UIKit.framework */; };
 		94057068185E69D400EB94BA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94057066185E69D400EB94BA /* InfoPlist.strings */; };
 		9405706A185E69D400EB94BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 94057069185E69D400EB94BA /* main.m */; };
 		9405706E185E69D400EB94BA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9405706D185E69D400EB94BA /* AppDelegate.m */; };
-		94057071185E69D400EB94BA /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9405706F185E69D400EB94BA /* Main_iPhone.storyboard */; };
-		94057074185E69D400EB94BA /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 94057072185E69D400EB94BA /* Main_iPad.storyboard */; };
 		94057079185E69D400EB94BA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 94057078185E69D400EB94BA /* Images.xcassets */; };
 		94057080185E69D400EB94BA /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9405707F185E69D400EB94BA /* XCTest.framework */; };
 		94057081185E69D400EB94BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9405705D185E69D400EB94BA /* Foundation.framework */; };
@@ -91,6 +90,7 @@
 		6628E1A81B39D97B00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
 		6628E1AA1B39D97B00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
 		6628E1AB1B39D97B00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E22E1B39F7BC00020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		9405705A185E69D400EB94BA /* EZAudioWaveformFromFileExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioWaveformFromFileExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9405705D185E69D400EB94BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9405705F185E69D400EB94BA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -101,8 +101,6 @@
 		9405706B185E69D400EB94BA /* EZAudioWaveformFromFileExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EZAudioWaveformFromFileExample-Prefix.pch"; sourceTree = "<group>"; };
 		9405706C185E69D400EB94BA /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		9405706D185E69D400EB94BA /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		94057070185E69D400EB94BA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
-		94057073185E69D400EB94BA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
 		94057078185E69D400EB94BA /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		9405707E185E69D400EB94BA /* EZAudioWaveformFromFileExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EZAudioWaveformFromFileExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		9405707F185E69D400EB94BA /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -233,8 +231,7 @@
 				6628E1881B39D97B00020E56 /* EZAudio */,
 				9405706C185E69D400EB94BA /* AppDelegate.h */,
 				9405706D185E69D400EB94BA /* AppDelegate.m */,
-				9405706F185E69D400EB94BA /* Main_iPhone.storyboard */,
-				94057072185E69D400EB94BA /* Main_iPad.storyboard */,
+				6628E22E1B39F7BC00020E56 /* MainStoryboard.storyboard */,
 				940570BC185E6A0400EB94BA /* WaveformFromFileViewController.h */,
 				940570BD185E6A0400EB94BA /* WaveformFromFileViewController.m */,
 				9417A6CE186591BC00D9D37B /* simple-drum-beat.wav */,
@@ -349,11 +346,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6628E22F1B39F7BC00020E56 /* MainStoryboard.storyboard in Resources */,
 				9417A6CF186591BC00D9D37B /* simple-drum-beat.wav in Resources */,
 				6628E1BD1B39D97B00020E56 /* VERSION in Resources */,
-				94057074185E69D400EB94BA /* Main_iPad.storyboard in Resources */,
 				94057079185E69D400EB94BA /* Images.xcassets in Resources */,
-				94057071185E69D400EB94BA /* Main_iPhone.storyboard in Resources */,
 				94057068185E69D400EB94BA /* InfoPlist.strings in Resources */,
 				6628E1BC1B39D97B00020E56 /* CHANGELOG in Resources */,
 			);
@@ -423,22 +419,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		9405706F185E69D400EB94BA /* Main_iPhone.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				94057070185E69D400EB94BA /* Base */,
-			);
-			name = Main_iPhone.storyboard;
-			sourceTree = "<group>";
-		};
-		94057072185E69D400EB94BA /* Main_iPad.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				94057073185E69D400EB94BA /* Base */,
-			);
-			name = Main_iPad.storyboard;
-			sourceTree = "<group>";
-		};
 		94057088185E69D400EB94BA /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/Main_iPad.storyboard b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/Main_iPad.storyboard
deleted file mode 100644
index 702aef0..0000000
--- a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/Main_iPad.storyboard
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
-    </dependencies>
-    <scenes>
-        <!--Waveform From File View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="WaveformFromFileViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="7Mj-Bw-gG2"/>
-                        <viewControllerLayoutGuide type="bottom" id="G7Q-3z-VRc"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NjS-lu-A8r" customClass="EZAudioPlot">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="NjS-lu-A8r" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="Hew-2N-2Vc"/>
-                            <constraint firstAttribute="bottom" secondItem="NjS-lu-A8r" secondAttribute="bottom" id="QJO-Yr-XAe"/>
-                            <constraint firstItem="NjS-lu-A8r" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="tRl-mN-7qK"/>
-                            <constraint firstAttribute="trailing" secondItem="NjS-lu-A8r" secondAttribute="trailing" id="wbC-hw-V1P"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="NjS-lu-A8r" id="MhW-xX-k6l"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/Main_iPhone.storyboard b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/Main_iPhone.storyboard
deleted file mode 100644
index 4ade776..0000000
--- a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/Main_iPhone.storyboard
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
-    </dependencies>
-    <scenes>
-        <!--Waveform From File View Controller-->
-        <scene sceneID="ufC-wZ-h7g">
-            <objects>
-                <viewController id="vXZ-lx-hvc" customClass="WaveformFromFileViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Uy4-gb-cCK"/>
-                        <viewControllerLayoutGuide type="bottom" id="anR-IY-kWc"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wJ1-QR-zjX" customClass="EZAudioPlot">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstAttribute="trailing" secondItem="wJ1-QR-zjX" secondAttribute="trailing" id="5iy-IT-HrP"/>
-                            <constraint firstItem="wJ1-QR-zjX" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="BW5-rx-Rbd"/>
-                            <constraint firstAttribute="trailing" secondItem="wJ1-QR-zjX" secondAttribute="trailing" id="HPH-gi-fep"/>
-                            <constraint firstItem="wJ1-QR-zjX" firstAttribute="top" secondItem="kh9-bI-dsS" secondAttribute="top" id="KJa-p3-PCH"/>
-                            <constraint firstAttribute="bottom" secondItem="wJ1-QR-zjX" secondAttribute="bottom" id="Kfc-GW-cwF"/>
-                            <constraint firstItem="wJ1-QR-zjX" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="WV3-7B-eJI"/>
-                            <constraint firstItem="wJ1-QR-zjX" firstAttribute="top" secondItem="kh9-bI-dsS" secondAttribute="top" id="gJX-Eu-y6Z"/>
-                            <constraint firstAttribute="bottom" secondItem="wJ1-QR-zjX" secondAttribute="bottom" id="gla-h7-kPa"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="audioPlot" destination="wJ1-QR-zjX" id="6n2-mE-oz7"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
\ No newline at end of file
diff --git a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample-Info.plist b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample-Info.plist
index 3fe658d..a65cbd4 100644
--- a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample-Info.plist
+++ b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample-Info.plist
@@ -25,9 +25,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
+	<string>MainStoryboard</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>MainStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
diff --git a/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/MainStoryboard.storyboard b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/MainStoryboard.storyboard
new file mode 100644
index 0000000..673e0f7
--- /dev/null
+++ b/EZAudioExamples/iOS/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/MainStoryboard.storyboard
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes/>
+</document>