diff --git a/Limelight/Input/StreamView.m b/Limelight/Input/StreamView.m
index 28b3952..905d84d 100644
--- a/Limelight/Input/StreamView.m
+++ b/Limelight/Input/StreamView.m
@@ -19,36 +19,64 @@
     touchLocation = [touch locationInView:self];
     touchMoved = false;
     
-    printf("Touch down\n");
+    NSLog(@"Touch down");
 }
 
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
-    UITouch *touch = [[event allTouches] anyObject];
-    CGPoint currentLocation = [touch locationInView:self];
     
-    if (touchLocation.x != currentLocation.x ||
-        touchLocation.y != currentLocation.y)
-    {
-        LiSendMouseMoveEvent(currentLocation.x - touchLocation.x,
-                             currentLocation.y - touchLocation.y );
+    if ([[event allTouches] count] == 1) {
+        UITouch *touch = [[event allTouches] anyObject];
+        CGPoint currentLocation = [touch locationInView:self];
+
+        if (touchLocation.x != currentLocation.x ||
+            touchLocation.y != currentLocation.y)
+        {
+            LiSendMouseMoveEvent(currentLocation.x - touchLocation.x,
+                                 currentLocation.y - touchLocation.y );
+            
+            touchMoved = true;
+            touchLocation = currentLocation;
+        }
+    } else if ([[event allTouches] count] == 2) {
+        CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:self];
+        CGPoint secondLocation = [[[[event allTouches] allObjects] objectAtIndex:1] locationInView:self];
         
+        CGPoint avgLocation = CGPointMake((firstLocation.x + secondLocation.x) / 2, (firstLocation.y + secondLocation.y) / 2);
+        if (touchLocation.y != avgLocation.y) {
+            LiSendScrollEvent(avgLocation.y - touchLocation.y);
+        }
         touchMoved = true;
-        touchLocation = currentLocation;
+        touchLocation = avgLocation;
     }
+    
 }
 
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    printf("Touch up\n");
+    NSLog(@"Touch up");
+    
     
     if (!touchMoved) {
-        printf("Sending left mouse button press\n");
-        
-        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
-        
-        // Wait 100 ms to simulate a real button press
-        usleep(100 * 1000);
-        
-        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+        if ([[event allTouches] count]  == 2) {
+            NSLog(@"Sending right mouse button press");
+            
+            LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
+            
+            // Wait 100 ms to simulate a real button press
+            usleep(100 * 1000);
+            
+            LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+            
+            
+        } else {
+            NSLog(@"Sending left mouse button press");
+            
+            LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+            
+            // Wait 100 ms to simulate a real button press
+            usleep(100 * 1000);
+            
+            LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+        }
     }
 }
 
diff --git a/iPad.storyboard b/iPad.storyboard
index 86400a9..6aeb903 100644
--- a/iPad.storyboard
+++ b/iPad.storyboard
@@ -130,7 +130,7 @@
         <scene sceneID="RuD-qk-7nb">
             <objects>
                 <viewController storyboardIdentifier="MainFrame" id="OIm-0n-i9v" customClass="StreamFrameViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="VPm-Ae-rc4" userLabel="RenderView" customClass="StreamView">
+                    <view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="VPm-Ae-rc4" userLabel="RenderView" customClass="StreamView">
                         <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
@@ -165,7 +165,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Settings" width="17" height="17"/>
+        <image name="Settings" width="25" height="25"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar" statusBarStyle="lightContent"/>
diff --git a/iPhone.storyboard b/iPhone.storyboard
index cd22b7f..b350acd 100644
--- a/iPhone.storyboard
+++ b/iPhone.storyboard
@@ -132,7 +132,7 @@
         <scene sceneID="5Eb-q2-vjt">
             <objects>
                 <viewController id="mI3-9F-XwU" customClass="StreamFrameViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="eir-e9-IPE" customClass="StreamView">
+                    <view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="eir-e9-IPE" customClass="StreamView">
                         <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
@@ -166,7 +166,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Settings" width="17" height="17"/>
+        <image name="Settings" width="25" height="25"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>