diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m
index ef7c4104..ab436a97 100644
--- a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m
+++ b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m
@@ -6,14 +6,16 @@
 //  Released under the MIT license
 //  http://opensource.org/licenses/mit-license.php
 //
-
+#import <UserNotifications/UserNotifications.h>
 #import <Photos/Photos.h>
 #import <MobileCoreServices/UTCoreTypes.h>
 #import "DPHostCameraRecorder.h"
 #import "DPHostRecorder.h"
 #import "DPHostUtils.h"
 #import "DPHostRecorderUtils.h"
-@interface DPHostCameraRecorder()
+
+static NSString *const kDPHostStartPreviewNotificationId = @"kDPHostStartPreviewNotificationId";
+@interface DPHostCameraRecorder()<UNUserNotificationCenterDelegate>
 @property (nonatomic) DPHostSimpleHttpServer *httpServer;
 /// Preview APIでプレビュー画像URIの配送を行うかどうか。
 @property (nonatomic) BOOL sendPreview;
@@ -117,7 +119,7 @@ - (void)takePhotoWithSuccessCompletion:(void (^)(NSURL *assetURL))successComplet
          }
          [weakSelf saveFileWithCompletionHandler:^(NSURL *assetURL, NSError *error) {
              
-             if ([weakSelf.session isRunning]) {
+             if ([weakSelf.session isRunning] && !weakSelf.sendPreview) {
                  [weakSelf.session stopRunning];
              }
              if (error) {
@@ -125,6 +127,7 @@ - (void)takePhotoWithSuccessCompletion:(void (^)(NSURL *assetURL))successComplet
              } else {
                  successCompletion(assetURL);
              }
+
          }];
      }];
 }
@@ -179,6 +182,7 @@ - (void)startWebServerWithSuccessCompletion:(void (^)(NSString *uri))successComp
         failCompletion(@"MJPEG Server cannot running.");
         return;
     }
+    [self showPreviewNotification];
     successCompletion(url);
 }
 
@@ -193,7 +197,7 @@ - (void)stopWebServer
     self.sendPreview = NO;
     // 次回プレビュー開始時に影響を与えない為に、初期値（無効値）を設定する。
     self.lastPreviewTimestamp = kCMTimeInvalid;
-    
+    [self hidePreviewNotification];
 }
 
 #pragma mark - Private Method
@@ -420,4 +424,60 @@ - (void) sendPreviewDataWithSampleBuffer:(CMSampleBufferRef)sampleBuffer
     }
     
 }
+
+#pragma mark - Notification Control
+- (void)showPreviewNotification
+{
+    UNMutableNotificationContent* content = [[UNMutableNotificationContent alloc] init];
+    content.title    = @"カメラ撮影中(iOS Host Camera Preview)";
+    content.body     = @"タップして撮影を停止します。";
+    // Deliver the notification in five seconds.
+    UNTimeIntervalNotificationTrigger* trigger = [UNTimeIntervalNotificationTrigger
+                                                  triggerWithTimeInterval:1
+                                                  repeats:NO];
+    UNNotificationRequest* nRequest = [UNNotificationRequest
+                                       requestWithIdentifier:kDPHostStartPreviewNotificationId
+                                                     content:content
+                                                     trigger:trigger];
+    
+    // Schedule the notification.
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
+        center.delegate = self;
+        [center addNotificationRequest:nRequest
+                 withCompletionHandler:^(NSError * _Nullable error) {
+                 }];
+
+    });
+}
+
+- (void)hidePreviewNotification
+{
+    UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
+    [center getDeliveredNotificationsWithCompletionHandler:^(NSArray<UNNotification *> * _Nonnull notifications) {
+        for (UNNotification *notification in notifications) {
+            NSString *currentId = notification.request.identifier;
+            if ([currentId isEqualToString:kDPHostStartPreviewNotificationId]) {
+                [center removeDeliveredNotificationsWithIdentifiers:@[kDPHostStartPreviewNotificationId]];
+                return;
+            }
+        }
+    }];
+    
+}
+#pragma mark - Notification Delegate
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+didReceiveNotificationResponse:(UNNotificationResponse *)response
+         withCompletionHandler:(void (^)(void))completionHandler {
+    completionHandler();
+    [self stopWebServer];
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler {
+    completionHandler(UNNotificationPresentationOptionBadge |
+                      UNNotificationPresentationOptionSound |
+                      UNNotificationPresentationOptionAlert);
+};
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostNotificationProfile.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostNotificationProfile.m
index c702e1b9..dd29b139 100755
--- a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostNotificationProfile.m
+++ b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostNotificationProfile.m
@@ -52,9 +52,10 @@ - (instancetype)init
         _notificationInfoDict = @{}.mutableCopy;
         
         [self setNotificationIdLength: 3];
-
-        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-        center.delegate = self;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+            center.delegate = self;
+        });
 
         // API登録(didReceivePostNotifyRequest相当)
         NSString *postNotifyRequestApiPath = [self apiPath: nil
diff --git a/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraManager.m b/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraManager.m
index b418cac2..4d7dc963 100644
--- a/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraManager.m
+++ b/dConnectDevicePlugin/dConnectDeviceSonyCamera/dConnectDeviceSonyCamera/Classes/SonyCameraManager.m
@@ -384,7 +384,7 @@ - (void) setZoomByDirection:(NSString *)direction
     __block typeof(self) weakSelf = self;
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSString *tmpMovement = movement;
+        NSString *tmpMovement = [movement stringByReplacingOccurrencesOfString:@"in-" withString:@""];
         if ([movement isEqualToString:@"max"]) {
             tmpMovement = @"start";
         }
diff --git a/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPOmnidirectionalImageProfile.m b/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPOmnidirectionalImageProfile.m
index b14582e2..a98ee0f5 100644
--- a/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPOmnidirectionalImageProfile.m
+++ b/dConnectDevicePlugin/dConnectDeviceTheta/dConnectDeviceTheta/Classes/DPOmnidirectionalImageProfile.m
@@ -2,10 +2,12 @@
 //  DPOmnidirectionalImageProfile.m
 //  dConnectDeviceTheta
 //
-//  Created by 星　貴之 on 2015/08/23.
-//  Copyright (c) 2015年 DOCOMO. All rights reserved.
+//  Copyright (c) 2015 NTT DOCOMO, INC.
+//  Released under the MIT license
+//  http://opensource.org/licenses/mit-license.php
 //
 
+
 #import "DPOmnidirectionalImageProfile.h"
 
 NSString *const DPOmnidirectionalImageProfileName = @"omnidirectionalImage";
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/accordion.css b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/accordion.css
index 90ea45b7..3e137303 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/accordion.css
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/accordion.css
@@ -27,6 +27,7 @@ img.plus {
 
 .ac_menu div.ac_content {
     box-shadow:0px 1px 5px #AAA inset;
+    border-bottom: thin solid #558BCA;
     background :#f4f4f4;
     -webkit-transition: all 0.5s;
     -moz-transition: all 0.5s;
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/checker.css b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/checker.css
index b256732e..4ecf1e88 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/checker.css
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/checker.css
@@ -3,6 +3,15 @@ body {
     margin: 0px;
     padding: 0px;
 }
+div.title {
+    background-color: #5B9CFC;
+    padding: 10px;
+    font-weight: bold;
+    color: #FFFFFF;
+}
+a.back{
+    color:#FFFFFF;
+}
 
 div.request_param {
     padding: 12px 8px 8px 8px;
@@ -200,12 +209,31 @@ div.test {
 input, select {
     vertical-align: middle;
 }
-div.title {
-    background-color: #5B9CFC;
-    padding: 10px;
-    font-weight: bold;
-    color: #FFFFFF;
+
+label {
+    animation-name: fadeIn;
+    animation-duration: 0.3s;
+    animation-iteration-count: 1;
+    animation-timing-function: ease-out;
+    animation-fill-mode: backwards;
 }
-a.back{
-    color:#FFFFFF;
+
+.ac_menu div.ac_content {
+    animation-name: fadeIn;
+    animation-duration: 0.3s;
+    animation-iteration-count: 1;
+    animation-timing-function: ease-out;
+    animation-fill-mode: backwards;
+}
+
+@keyframes fadeIn {
+    from {
+        transform:translateY(300px);
+        opacity: 0.0;
+    }
+
+    to {
+        transform:translateY(0px);
+        opacity: 1.0;
+    }
 }
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/index.css b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/index.css
index 06619852..dbc7be33 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/index.css
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/index.css
@@ -6,6 +6,15 @@
 body {
     background-color: #FBFBFB;
 }
+div.title {
+    background-color: #5B9CFC;
+    padding: 10px;
+    font-weight: bold;
+    color: #FFFFFF;
+}
+a.back{
+    color:#FFFFFF;
+}
 
 img.icon {
     width: 42px;
@@ -38,20 +47,28 @@ div.profileName {
     border-right: solid 1px #E5E5E5;
     box-shadow: 0px 0px 2px #F3F3F3;
     color: #5B9CFC;
-}
 
+    animation-name: fadeIn;
+    animation-duration: 0.3s;
+    animation-iteration-count: 1;
+    animation-timing-function: cubic-bezier(0, 1.1, 1, 1.1);
+    animation-fill-mode: backwards;
+}
 
 a { text-decoration: none; }
 a:link { color: #5B9CFC; }
 a:visited { color: #5B9CFC; }
 a:hover { color: #5B9CFC; }
 a:active { color: #5B9CFC; }
-div.title {
-    background-color: #5B9CFC;
-    padding: 10px;
-    font-weight: bold;
-    color: #FFFFFF;
-}
-a.back{
-    color:#FFFFFF;
+
+@keyframes fadeIn {
+    from {
+        transform: scale(0.0, 0.0);
+        opacity: 0.0;
+    }
+
+    to {
+        transform: scale(1.0, 1.0);
+        opacity: 1.0;
+    }
 }
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/resource.css b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/resource.css
index b458c30d..cebd992e 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/resource.css
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/css/resource.css
@@ -10,3 +10,4 @@ div.title {
 a.back{
     color:#FFFFFF;
 }
+
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/index.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/index.html
index 1afd794c..f566b128 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/index.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/index.html
@@ -17,7 +17,7 @@
     <script id="profileCell" type="text/x-template">
         <a href="{#url}">
             <div class="grid">
-                <div>
+                <div style="animation-delay: {#delay}s;">
                     <img class="icon" src="{#icon}"><br>
                     <div class="profileName">{#content}</div>
                 </div>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/checker.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/checker.js
index 2fbc6a94..b2050959 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/checker.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/checker.js
@@ -1,10 +1,13 @@
 
 var main = (function(parent, global) {
 
+    var delay = 0;
+
     function init() {
         util.init(function(name, json) {
             createSupportApis(json);
         });
+            
     }
     parent.init = init;
 
@@ -12,7 +15,6 @@ var main = (function(parent, global) {
             location.href = "./index.html?serviceId=" + util.getServiceId();
     }
     parent.back = back;
-
     function onChangeValue(nav, name) {
         var elem = document.forms[nav];
         elem['t_' + name].value = elem[name].value;
@@ -124,7 +126,7 @@ var main = (function(parent, global) {
             setRequestText(nav, createRequest(method + " " + path));
 
             if (method == 'PUT') {
-                dConnect.addEventListener(uri, function(json) {
+                util.addEventListener(uri, function(json) {
                     setEventText(nav, createEvent(util.formatJSON(json)));
                 }, function(json) {
                     setResponseText(nav, createResponse(util.formatJSON(JSON.stringify(json))));
@@ -132,7 +134,7 @@ var main = (function(parent, global) {
                     setResponseText(nav, createResponse("errorCode=" + errorCode + " errorMessage=" + errorMessage));
                 });
             } else {
-                dConnect.removeEventListener(uri, function(json) {
+                util.removeEventListener(uri, function(json) {
                     setResponseText(nav, createResponse(util.formatJSON(JSON.stringify(json))));
                 }, function(errorCode, errorMessage) {
                     setResponseText(nav, createResponse("errorCode=" + errorCode + " errorMessage=" + errorMessage));
@@ -246,7 +248,6 @@ var main = (function(parent, global) {
         };
         return util.createTemplate('param_slider', data);
     }
-
     function createBooleanParam(name, value, on) {
         var data = {
             'name' : name,
@@ -256,6 +257,7 @@ var main = (function(parent, global) {
         };
         return util.createTemplate('param_boolean', data);
     }
+            
 
     function createRequest(body) {
         var data = {
@@ -346,8 +348,10 @@ var main = (function(parent, global) {
         var data = {
             'title': method.toUpperCase() + ' ' + createDConnectPath(basePath, path),
             'nav' : method + '_' + path,
-            'content' : createParameter(method, basePath, path, param['x-type'], param.parameters)
+            'content' : createParameter(method, basePath, path, param['x-type'], param.parameters),
+            'delay' : delay
         };
+        delay += 0.1;
         return util.createTemplate('command', data);
     }
 
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/index.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/index.js
index 232ea1a0..fbc9ed19 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/index.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/index.js
@@ -25,6 +25,8 @@ var main = (function(parent, global) {
         'connection' : 'images/icon33_connect6.png',
     };
 
+    var delay = 0;
+
     function init() {
         util.init(function(name, json) {
             createProfileList(json.supports);
@@ -39,8 +41,10 @@ var main = (function(parent, global) {
         var data = {
             'url' : url,
             'content' : content,
-            'icon' : icon
+            'icon' : icon,
+            'delay' : delay
         };
+        delay += 0.08;
         return util.createTemplate('profileCell', data);
     }
 
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/util.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/util.js
index d29507b4..b90541b5 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/util.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/util.js
@@ -1,58 +1,81 @@
 var util = (function(parent, global) {
+    function initScope() {
+        return  Array(
+           'serviceDiscovery',
+           'serviceInformation',
+           'system',
+           'battery',
+           'connection',
+           'deviceOrientation',
+           'file',
+           'mediaPlayer',
+           'mediaStreamRecording',
+           'notification',
+           'phone',
+           'proximity',
+           'setting',
+           'vibration',
+           'light',
+           'remoteController',
+           'driveController',
+           'mhealth',
+           'sphero',
+           'dice',
+           'temperature',
+           'camera',
+           'canvas',
+           'health',
+           'touch',
+           'humanDetection',
+           'keyEvent',
+           'omnidirectionalImage',
+           'tv',
+           'powerMeter',
+           'humidity',
+           'illuminance',
+           'videoChat',
+           'airConditioner',
+           'atmosphericPressure',
+           'ecg',
+           'poseEstimation',
+           'stressEstimation',
+           'walkState',
+           'gpio',
+           'geolocation',
+           'echonetLite');
+    }
+
     var mAccessToken = null;
     var mSessionKey = "test-session-key";
     var mHost = "localhost";
-    var mScopes = Array(
-            'servicediscovery',
-            'serviceinformation',
-            'system',
-            'battery',
-            'connection',
-            'deviceorientation',
-            'filedescriptor',
-            'file',
-            'mediaplayer',
-            'mediastreamrecording',
-            'notification',
-            'phone',
-            'proximity',
-            'setting',
-            'vibration',
-            'light',
-            'remotecontroller',
-            'drivecontroller',
-            'mhealth',
-            'sphero',
-            'dice',
-            'temperature',
-            'camera',
-            'canvas',
-            'health',
-            'touch',
-            'humandetection',
-            'keyevent',
-            'omnidirectionalimage',
-            'tv',
-            'powermeter',
-            'humidity',
-            'illuminance',
-            'videochat',
-            'airconditioner',
-            'atmosphericpressure',
-            'ecg',
-            'poseEstimation',
-            'stressEstimation',
-            'walkState',
-            'gpio',
-            'geolocation');
+    var mScopes = initScope();
 
     function init(callback) {
+        loadScope();
+
         dConnect.setHost(mHost);
         dConnect.setExtendedOrigin("file://");
         checkDeviceConnect(callback);
     }
     parent.init = init;
 
+
+    function loadScope() {
+        var scopeStr = getCookie("scope");
+        if (scopeStr) {
+            mScopes = scopeStr.split(',');
+            if (mScopes == undefined) {
+                mScopes = initScope();
+            }
+        }
+    }
+
+    function saveScope() {
+        var scopeStr = mScopes.join(',');
+        setCookie("scope", scopeStr);
+    }
+
+
     function startManager(onAvailable) {
         var errorCallback = function(errorCode, errorMessage) {
             switch (errorCode) {
@@ -79,24 +102,14 @@ var util = (function(parent, global) {
 
             mAccessToken = getCookie('accessToken');
 
-            serviceDiscovery(function(services) {
-                var serviceId = getServiceId();
-                for (var i = 0; i < services.length; i++) {
-                    if (serviceId === services[i].id) {
-                        var service = services[i];
-                        serviceInformation(function(json) {
-                            openWebSocketIfNeeded();
-                            callback(service.name, json);
-                        });
-                        return;
-                    }
-                }
-                alert('指定されたサービスが見つかりません。\n serviceId=' + serviceId);
+            serviceInformation(function(json) {
+                openWebSocketIfNeeded();
+                callback(null, json);
             });
         });
     }
 
-    function authorization(callback) {
+    function authorization(callback, errorCallback) {
         dConnect.authorization(mScopes, 'デバイス確認画面',
             function(clientId, accessToken) {
                 mAccessToken = accessToken;
@@ -106,6 +119,9 @@ var util = (function(parent, global) {
             },
             function(errorCode, errorMessage) {
                 showAlert("認証に失敗しました", errorCode, errorMessage);
+                if (errorCallback) {
+                    errorCallback(errorCode, errorMessage);
+                }
             });
     }
 
@@ -225,6 +241,7 @@ var util = (function(parent, global) {
         if (!containsScope(p[2])) {
             mScopes.push(p[2]);
         }
+        saveScope();
     }
 
     function rebuildUri(uri) {
@@ -298,7 +315,7 @@ var util = (function(parent, global) {
              case 4: {
                  if (xhr.status == 200) {
                     var json = JSON.parse(xhr.responseText);
-                    if (json.result == 1 && json.errorCode == 14) {
+                    if (json.result == 1 && (json.errorCode == 14 || json.errorCode == 15)) {
                         appendScope(uri);
                         authorization(function() {
                             if (method.toUpperCase() == 'GET' || method.toUpperCase() == 'DELETE') {
@@ -307,6 +324,8 @@ var util = (function(parent, global) {
                                 body.set('accessToken', mAccessToken);
                             }
                             sendRequest(method, uri, body, callback);
+                        }, function(errorCode, errorMessage) {
+                            callback(xhr.status, xhr.responseText);
                         });
                         return;
                     }
@@ -323,6 +342,45 @@ var util = (function(parent, global) {
     parent.sendRequest = sendRequest;
 
 
+    function addEventListener(uri, eventCallback, successCallback, errorCallback) {
+        dConnect.addEventListener(uri, eventCallback, successCallback,
+            function(errorCode, errorMessage) {
+                if (errorCode == 14 || errorCode == 15) {
+                    appendScope(uri);
+                    authorization(function() {
+                        uri = rebuildUri(uri);
+                        addEventListener(uri, eventCallback, successCallback, errorCallback);
+                    }, function(errorCode, errorMessage) {
+                         errorCallback(errorCode, errorMessage);
+                    });
+                } else {
+                   errorCallback(errorCode, errorMessage);
+                }
+            });
+    }
+    parent.addEventListener = addEventListener;
+
+
+    function removeEventListener(uri, successCallback, errorCallback) {
+        dConnect.removeEventListener(uri, successCallback,
+            function(errorCode, errorMessage) {
+                if (errorCode == 14 || errorCode == 15) {
+                    appendScope(uri);
+                    authorization(function() {
+                        uri = rebuildUri(uri);
+                        console.log(uri);
+                        addEventListener(uri, eventCallback, successCallback, errorCallback);
+                    }, function(errorCode, errorMessage) {
+                         errorCallback(errorCode, errorMessage);
+                    });
+                } else {
+                   errorCallback(errorCode, errorMessage);
+                }
+            });
+    }
+    parent.removeEventListener = removeEventListener;
+
+
     function getUri(path) {
         return 'http://' + mHost + ':4035' + path;
     }
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/css/main.css b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/css/main.css
index 593116f4..d871eda0 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/css/main.css
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/css/main.css
@@ -1,24 +1,29 @@
 li {
     margin-bottom: 10px;
 }
-div.title {
-    background-color: #3EA3D3;
+
+div.heading {
+    background-color: #9ECDF9;
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
     padding: 10px;
     font-weight: bold;
-    color: #FFFFFF;
+    border-left: 10px solid #008ee1;
 }
-div.heading {
-    background-color: #9ECDF9;
+div.title {
+    background-color: #3EA3D3;
     padding: 10px;
     font-weight: bold;
+    color: #FFFFFF;
 }
 
+
 div.content {
     margin: 0px 0px;
 }
 
 div.link {
     margin: 32px 4px 4px 4px;
+    line-height: 200%;
 }
 
 button {
@@ -27,7 +32,9 @@ button {
     margin: 4px;
     background-color: #9ECDF9;
     color: #000;
-    border-style: none;
+    border: 1px solid #88F;
+
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
 
     -moz-border-radius: 16px;
     -webkit-border-radius: 16px;
@@ -44,7 +51,7 @@ img.start {
 }
 
 img.dialog {
-    width: 50%;
+    width: 40%;
 }
 
 div.image {
@@ -61,12 +68,13 @@ div.wrapper {
 div.box {
     position: relative;
     background: #fff;
-    height: 40px;
+    height: 32px;
     width: 80%;
     left: 40px;
     padding: 12px;
     border: 1px solid #666;
     border-radius: 24px;
+    font-size: small;
 }
 
 div.box:after {
@@ -93,20 +101,37 @@ div#battery {
     font-size: 200%;
 }
 
-div.photo {
+table.settings {
     text-align: center;
-    margin: 12px;
+    margin-right: auto;
+    margin-left: auto
+    border-spacing: 12px;
 }
 
-img#preview {
-    width: 80%;
-    margin: 12px;
+td.name {
+    text-align: right;
 }
 
-img.photo {
-    width: 10%;
-    margin: 12px;
+td.value {
+    text-align: left;
 }
-a.back{
-color:#FFFFFF;
+
+span.label {
+    font-size: small;
+}
+
+ul.menu {
+    list-style-image: url('../summary/images/mark.png');
+}
+
+.select-box {
+    background: #FAFAFF;
+    border: 2px solid #008ee1;
+    border-radius: 5px;
+    color: #0C2245;
+    height: 30px;
+    line-height: 30px;
+    text-align: left;
+    text-indent: 5px;
+    vertical-align: middle;
 }
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/index.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/index.html
index 07c0f9eb..a727d783 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/index.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/index.html
@@ -7,20 +7,19 @@
         <title>ヘルプ</title>
     </head>
     <body>
-        <div class="title" align="center">ヘルプ</div>
         <div class="heading">はじめに</div>
         <div class="content">
-            <ul>
+            <ul class="menu">
                 <li><a href="summary/browser.html">dConnectBrowserとは</a></li>
             </ul>
             <div class="heading">HOSTプラグインを利用する</div>
-            <ul>
+            <ul class="menu">
                 <li><a href="tutorial/host_tutorial.html">HOSTプラグインを利用する</a></li>
             </ul>
             <div class="heading">Device Web API コンソーシアム</div>
-            <ul>
+            <ul class="menu">
                 <li><a href="https://device-webapi.org/">Device Web API コンソーシアム</a></li>
             </ul>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/summary/images/mark.png b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/summary/images/mark.png
new file mode 100644
index 00000000..2d398d18
Binary files /dev/null and b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/summary/images/mark.png differ
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/css/demo_take_photo.css b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/css/demo_take_photo.css
new file mode 100644
index 00000000..50cf6dc5
--- /dev/null
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/css/demo_take_photo.css
@@ -0,0 +1,74 @@
+body {
+    background-size: cover;
+    background-repeat: no-repeat;
+}
+
+img.camera {
+    width: 64px;
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+
+img#preview {
+    width: 80%;
+    margin: 12px;
+}
+
+div#thumbnails {
+    width: 40px;
+    right: 0;
+}
+
+img.thumbnail {
+    display: block;
+    width: 32px;
+    margin: 4px;
+    border: 4px solid #FFF;
+}
+
+div.menu {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #444;
+    text-align: center;
+}
+
+div.photo {
+    text-align: center;
+    margin: 12px;
+}
+
+div#photos {
+    position: absolute;
+    display: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100%;
+}
+
+div.back {
+    width: 100%;
+    height: 100%;
+
+    background-color: #000;
+    filter: alpha(opacity=60);
+    -moz-opacity: 0.6;
+    opacity: 0.6;
+}
+
+img#photo {
+    position: absolute;
+    border: 6px solid #FFF;
+    width: 80%;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+}
+
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_acceleration.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_acceleration.html
index 71db481b..c97418d8 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_acceleration.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_acceleration.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../../css/main.css" type="text/css" />
     <script type="text/javascript" src="js/dconnectsdk-2.2.0.js"></script>
     <script type="text/javascript" src="js/util.js"></script>
@@ -11,12 +11,12 @@
     <title>加速度センサー</title>
 </head>
 <body onload="demoAcceleration.init()">
-    <div class="title" align="left" style="float:left;">
-    <a class="back" href="javascript:history.back();">＜</a>
-</div>
-<div class="title" align="center">加速度センサー</div>
+    <div class="heading" align="left" style="float:left;color=#FFFFFF;">
+        <a class="back" href="javascript:history.back();">＜</a>
+    </div>
+    <div class="heading">加速度センサー</div>
     <div style="text-align:center;margin:12px;">
-        <canvas id="graph" width="200" height="200" style="border: solid 1px #000000;"></canvas>
+        <canvas id="graph" width="380" height="200" style="border: solid 1px #000000;"></canvas>
     </div>
     <div style="text-align:center;">
         <button onclick="demoAcceleration.registerEvent()">開始</button>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_battery.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_battery.html
index fea8e7af..2c83c894 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_battery.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_battery.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../../css/main.css" type="text/css" />
     <script type="text/javascript" src="js/dconnectsdk-2.2.0.js"></script>
     <script type="text/javascript" src="js/util.js"></script>
@@ -10,12 +10,12 @@
     <title>バッテリー</title>
 </head>
     <body onload="demoBattery.init()">
-        <div class="title" align="left" style="float:left;">
-    <a class="back" href="javascript:history.back();">＜</a>
-</div>
-<div class="title" align="center">バッテリー</div>
+        <div class="heading" align="left" style="float:left;color=#FFFFFF;">
+            <a class="back" href="javascript:history.back();">＜</a>
+        </div>
+        <div class="heading">バッテリー</div>
         <div style="margin:12px;text-align:center;">
-            <img class="dialog" id="batteryImage">
+            <img id="batteryImage">
             <div id="battery" style="margin:12px;">
         </div>
     </body>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_take_photo.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_take_photo.html
index 9e2dd733..f2acc022 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_take_photo.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_take_photo.html
@@ -1,30 +1,45 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../../css/main.css" type="text/css" />
+    <link rel="stylesheet" href="./css/demo_take_photo.css" type="text/css" />
     <script type="text/javascript" src="js/dconnectsdk-2.2.0.js"></script>
     <script type="text/javascript" src="js/util.js"></script>
     <script type="text/javascript" src="js/demo_take_photo.js"></script>
     <title>写真を撮影する</title>
 </head>
 <body onLoad="demoTakePhoto.init()">
-<div class="title" align="left" style="float:left;">
-    <a class="back" href="javascript:history.back();">＜</a>
-</div>
-<div class="title" align="center">写真を撮影する</div>
+    <div class="heading" align="left" style="float:left;color=#FFFFFF;">
+        <a class="back" href="javascript:demoTakePhoto.backLink();">＜</a>
+    </div>
+    <div class="heading">写真を撮影する</div>
     <div class="photo">
         <form name="recorder">
-            <select name="target" onchange="demoTakePhoto.onChangeTarget()"></select>
-            <select name="imageSize" onchange="demoTakePhoto.onChangeOption()"></select>
-            <select name="previewSize" onchange="demoTakePhoto.onChangeOption()"></select>
+            <table class="settings">
+                <tr>
+                    <td class="name"><span class="label">ターゲット:</span></td>
+                    <td class="value"><select class="select-box" name="target" onchange="demoTakePhoto.onChangeTarget()"></select></td>
+                </tr>
+                <tr>
+                    <td class="name"><span class="label">撮影サイズ:</span></td>
+                    <td class="value"><select class="select-box" name="imageSize" onchange="demoTakePhoto.onChangeOption()"></select></td>
+                </tr>
+                <tr>
+                    <td class="name"><span class="label">プレビューサイズ:</span></td>
+                    <td class="value"><select class="select-box" name="previewSize" onchange="demoTakePhoto.onChangeOption()"></select></td>
+                </tr>
+            </table>
         </form>
-        <div style="margin:12px;">
-            <img id="preview" crossOrigin="anonymous">
-        </div>
-        <button onclick="demoTakePhoto.onTakePhoto()">撮影</button>
+        <div id="thumbnails"></div>
+    </div>
+    <div class="menu">
+        <img class="camera" src="./images/take_photo_1.png" onclick="demoTakePhoto.onTakePhoto()">
+    </div>
+    <div id="photos">
+        <div class="back"></div>
+        <img id="photo" crossorigin="anonymous">
     </div>
-    <div id="photos" style="margin:12px;"></div>
 </body>
 </html>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_vibration.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_vibration.html
index 2f0abab4..0df7318c 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_vibration.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_vibration.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../../css/main.css" type="text/css" />
     <script type="text/javascript" src="js/dconnectsdk-2.2.0.js"></script>
     <script type="text/javascript" src="js/util.js"></script>
@@ -10,28 +10,12 @@
     <title>バイブレーション</title>
 </head>
 <body onload="demoVibration.init()">
-<div class="title" align="left" style="float:left;">
+<div class="heading" align="left" style="float:left;color=#FFFFFF;">
     <a class="back" href="javascript:history.back();">＜</a>
 </div>
-<div class="title" align="center">バイブレーション</div>
+<div class="heading">バイブレーション</div>
 <div style="text-align:center;">
-<!-- 
-    <div style="margin:12px;">
-        <form name="vibration">
-            繰り返しパターン:
-            <select name="pattern">
-                <option value="0">1秒間バイブレーション</option>
-                <option value="1">1秒置きに5回バイブレーション</option>
-                <option value="2">2秒間バイブレーション</option>
-                <option value="3">2秒置きに5回バイブレーション</option>
-            </select>
-        </form>
-    </div>
- -->
-    <button onclick="demoVibration.startVibration()">振動</button>
-<!-- 
-    <button onclick="demoVibration.stopVibration()">停止</button>
- -->
+    <button onclick="demoVibration.startVibration()">開始</button>
 </div>
 
 </body>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/images/take_photo_1.png b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/images/take_photo_1.png
new file mode 100644
index 00000000..6d6b018d
Binary files /dev/null and b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/images/take_photo_1.png differ
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/dconnectsdk-2.2.0.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/dconnectsdk-2.2.0.js
index 83b17806..22d14691 100755
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/dconnectsdk-2.2.0.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/dconnectsdk-2.2.0.js
@@ -991,14 +991,14 @@ var dConnect = (function(parent, global) {
     },
 
     /**
-     * Settingプロファイルの定数
+     * Settingsプロファイルの定数
      * @namespace
      * @type {Object.<String, (String|Number)>}
      */
-    setting: {
+    settings: {
       // Profile name
       /** プロファイル名。 */
-      PROFILE_NAME: 'setting',
+      PROFILE_NAME: 'settings',
 
       // Interface
       /** インターフェース: sound */
@@ -1011,8 +1011,8 @@ var dConnect = (function(parent, global) {
       ATTR_VOLUME: 'volume',
       /** アトリビュート: date */
       ATTR_DATE: 'date',
-      /** アトリビュート: brightness */
-      ATTR_BRIGHTNESS: 'brightness',
+      /** アトリビュート: light */
+      ATTR_LIGHT: 'light',
       /** アトリビュート: sleep */
       ATTR_SLEEP: 'sleep',
 
@@ -1170,47 +1170,6 @@ var dConnect = (function(parent, global) {
 
       /** モードフラグ：フィルモード */
       MODE_FILLS: 'fills'
-    },
-
-    /**
-     * Geolocationプロファイルの定数
-     * @namespace
-     * @type {Object.<String, String>}
-     */
-    geolocation: {
-      // Profile name
-      /** プロファイル名。 */
-      PROFILE_NAME: 'geolocation',
-
-      // Attribute
-      /** アトリビュート: currentposition */
-      ATTR_CURRENT_POSITION: 'currentposition',
-      /** アトリビュート: onwatchposition */
-      ATTR_ON_WATCH_POSITION: 'onwatchposition',
-
-      // Parameter
-      /** パラメータ: position */
-      PARAM_POSITION: 'position',
-      /** パラメータ: coordinates */
-      PARAM_COORDINATES: 'coordinates',
-      /** パラメータ: latitude */
-      PARAM_LATITUDE: 'latitude',
-      /** パラメータ: longitude */
-      PARAM_LONGNITUDE: 'longitude',
-      /** パラメータ: altitude */
-      PARAM_ALTITUDE: 'altitude',
-      /** パラメータ: accuracy */
-      PARAM_ACCURACY: 'accuracy',
-      /** パラメータ: altitudeAccuracy */
-      PARAM_ALTITUDE_ACCURACY: 'altitudeAccuracy',
-      /** パラメータ: heading */
-      PARAM_HEADING: 'heading',
-      /** パラメータ: speed */
-      PARAM_SPEED: 'speed',
-      /** パラメータ: timeStamp */
-      PARAM_TIME_STAMP: 'timeStamp',
-      /** パラメータ: timeStampString */
-      PARAM_TIME_STAMP_STRING: 'timeStampString'
     }
   };
   parent.constants = constants;
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_acceleration.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_acceleration.js
index 3ff8670b..f453a1ef 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_acceleration.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_acceleration.js
@@ -7,7 +7,7 @@ var demoAcceleration = (function(parent, global) {
     var mTimerId;
 
     var mContext;
-    var mWidth =  window.parent.screen.width / 1.5;
+    var mWidth = 380;
     var mHeight = 200;
 
     var mDataSize = mWidth / 4;
@@ -21,7 +21,6 @@ var demoAcceleration = (function(parent, global) {
         if (!canvas || !canvas.getContext) {
             return false;
         }
-        document.getElementById("graph").width = mWidth;
         mContext = canvas.getContext('2d');
         mContext.lineWidth = 1;
         drawGraph();
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_battery.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_battery.js
index 9534718b..173d3042 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_battery.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_battery.js
@@ -56,6 +56,7 @@ var demoBattery = (function(parent, global) {
         builder.setAttribute('onchargingchange');
         builder.setServiceId(mServiceId);
         builder.setAccessToken(util.getAccessToken());
+        builder.setSessionKey(util.getSessionKey());
         var uri = builder.build();
 
         dConnect.addEventListener(uri, function(message) {
@@ -73,6 +74,7 @@ var demoBattery = (function(parent, global) {
         builder.setAttribute('onbatterychange');
         builder.setServiceId(mServiceId);
         builder.setAccessToken(util.getAccessToken());
+        builder.setSessionKey(util.getSessionKey());
         var uri = builder.build();
 
         dConnect.addEventListener(uri, function(message) {
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_take_photo.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_take_photo.js
index 1040bbbe..2315daba 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_take_photo.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_take_photo.js
@@ -4,6 +4,7 @@ var demoTakePhoto = (function(parent, global) {
     var mMediaRecorders;
     var mImageSizes;
     var mPreviewSizes;
+    var mPreviewTarget;
 
     function init() {
         util.init(function(service) {
@@ -13,11 +14,8 @@ var demoTakePhoto = (function(parent, global) {
     }
     parent.init = init;
 
-    function refreshImg(uri, id) {
-        var img = document.getElementById(id);
-        if (img) {
-            img.src = uri + '?' + Date.now();
-        }
+    function refreshImg(uri) {
+        document.body.style.backgroundImage = 'url(' + uri + ')';
     }
 
     function getCameraTarget() {
@@ -31,7 +29,7 @@ var demoTakePhoto = (function(parent, global) {
             mMediaRecorders = json.recorders;
             createMediaRecorders();
         }, function(errorCode, errorMessage) {
-            util.showAlert("カメラ情報の取得に失敗しました。。", errorCode, errorMessage);
+            util.showAlert('カメラ情報の取得に失敗しました。。', errorCode, errorMessage);
         });
     }
 
@@ -49,18 +47,10 @@ var demoTakePhoto = (function(parent, global) {
             mImageSizes = json.imageSizes;
             mPreviewSizes = json.previewSizes;
             createOptions();
+            onStartPreview();
         }, function(errorCode, errorMessage) {
-             var imageSizes = document.recorder.imageSize;
-             var iOption = document.createElement('option');
-             iOption.setAttribute('value', '0');
-             iOption.innerHTML = 'Unsupported size';
-             imageSizes.appendChild(iOption);
-             var previewSizes = document.recorder.previewSize;
-             var pOption = document.createElement('option');
-             pOption.setAttribute('value', '0');
-             pOption.innerHTML = 'Unsupported size';
-             previewSizes.appendChild(pOption);
-             util.showAlert("カメラ情報の取得に失敗しました。。", errorCode, errorMessage);
+            util.showAlert('カメラ情報の取得に失敗しました。。', errorCode, errorMessage);
+             onStartPreview();
         });
     }
 
@@ -80,10 +70,10 @@ var demoTakePhoto = (function(parent, global) {
     function createOptions() {
         var minWidth = 10000000;
         var imageSizes = document.recorder.imageSize;
-        for (var i = 0; i < mMediaRecorders.length; i++) {
+        for (var i = 0; i < mImageSizes.length; i++) {
             var option = document.createElement('option');
             option.setAttribute('value', i);
-            option.innerHTML = mImageSizes[i].width + "x" + mImageSizes[i].height;
+            option.innerHTML = mImageSizes[i].width + 'x' + mImageSizes[i].height;
 
             if (mImageSizes[i].width < minWidth) {
                 option.selected = true;
@@ -98,22 +88,15 @@ var demoTakePhoto = (function(parent, global) {
         for (var i = 0; i < mPreviewSizes.length; i++) {
             var option = document.createElement('option');
             option.setAttribute('value', i);
-            option.innerHTML = mPreviewSizes[i].width + "x" + mPreviewSizes[i].height;
+            option.innerHTML = mPreviewSizes[i].width + 'x' + mPreviewSizes[i].height;
 
             if (mPreviewSizes[i].width < minWidth) {
                 option.selected = true;
-                minWidth = mImageSizes[i].width
+                minWidth = mPreviewSizes[i].width
             }
 
             previewSizes.appendChild(option);
         }
-        if (mMediaRecorders.length == 0) {
-            var option = document.createElement('option');
-            option.setAttribute('value', 'Unsupported size');
-            previewSizes.appendChild(option);
-        }
-
-        startPreview();
     }
 
     function startPreview() {
@@ -129,14 +112,14 @@ var demoTakePhoto = (function(parent, global) {
         }
         var uri = builder.build();
         dConnect.put(uri, null, null, function(json) {
-            refreshImg(json.uri, 'preview');
+            refreshImg(json.uri);
         }, function(errorCode, errorMessage) {
-            util.showAlert("プレビュー開始に失敗しました。", errorCode, errorMessage);
+            util.showAlert('プレビュー開始に失敗しました。', errorCode, errorMessage);
         });
     }
 
     function stopPreview(callback) {
-        var target = document.recorder.target.value;
+        var target = mPreviewTarget;
 
         var builder = new dConnect.URIBuilder();
         builder.setProfile('mediastreamrecording');
@@ -152,23 +135,42 @@ var demoTakePhoto = (function(parent, global) {
                 setTimeout(callback, 2000);
             }
         }, function(errorCode, errorMessage) {
-            util.showAlert("プレビュー停止に失敗しました。", errorCode, errorMessage);
+            console.log('プレビュー停止に失敗しました。' + errorCode + ":" + errorMessage);
         });
     }
 
+    function showPhoto(uri) {
+        var elem = document.getElementById('photos');
+        elem.style.display = 'block';
+        elem.onclick = function() {
+            elem.style.display = 'none';
+        };
+
+        var image = document.getElementById('photo');
+        image.setAttribute('src', uri);
+    }
+
+    function onClickPhoto(elem) {
+        var uri = elem.getAttribute("src")
+        showPhoto(uri);
+    }
+
     function addPhoto(uri) {
-        var elem = document.createElement("img");
-        elem.setAttribute("src", uri);
-        elem.setAttribute("class", "photo")
-        elem.setAttribute("crossorigin", "anonymous")
-        elem.setAttribute("alt", "写真");
+        var elem = document.createElement('img');
+        elem.setAttribute('src', uri);
+        elem.setAttribute('class', 'thumbnail')
+        elem.setAttribute('crossorigin', 'anonymous')
+        elem.setAttribute('alt', '写真');
+        elem.onclick = function() {
+            showPhoto(uri);
+        };
 
-        var tag = document.getElementById('photos');
+        var tag = document.getElementById('thumbnails');
         tag.appendChild(elem);
     }
 
     function onTakePhoto() {
-        var target = document.recorder.target.value;
+        var target = mPreviewTarget;
 
         var builder = new dConnect.URIBuilder();
         builder.setProfile('mediastreamrecording');
@@ -180,13 +182,32 @@ var demoTakePhoto = (function(parent, global) {
         }
         var uri = builder.build();
         dConnect.post(uri, null, null, function(json) {
-            refreshImg(json.uri, 'preview');
+            addPhoto(json.uri);
         }, function(errorCode, errorMessage) {
-            util.showAlert("撮影に失敗しました。", errorCode, errorMessage);
+            util.showAlert('撮影に失敗しました。', errorCode, errorMessage);
         });
     }
     parent.onTakePhoto = onTakePhoto;
 
+    function onStartPreview() {
+        if (mPreviewTarget) {
+            stopPreview(function() {
+                mPreviewTarget = document.recorder.target.value;
+                startPreview();
+            });
+        } else {
+            mPreviewTarget = document.recorder.target.value;
+            startPreview();
+        }
+    }
+    parent.onStartPreview = onStartPreview;
+
+    function onStopPreview() {
+        stopPreview(null);
+        mPreviewTarget = undefined;
+    }
+    parent.onStopPreview = onStopPreview;
+
     function onChangeTarget() {
         var target = document.recorder.target.value;
         getCameraOption(target);
@@ -218,16 +239,31 @@ var demoTakePhoto = (function(parent, global) {
             builder.addParameter('imageHeight', imageHeight);
             builder.addParameter('previewWidth', previewWidth);
             builder.addParameter('previewHeight', previewHeight);
-            builder.addParameter('mimeType', "image/png");
+            builder.addParameter('mimeType', 'image/png');
             var uri = builder.build();
             dConnect.put(uri, null, null, function(json) {
-                startPreview();
+                if (mPreviewTarget) {
+                    startPreview();
+                }
             }, function(errorCode, errorMessage) {
-                util.showAlert("設定に失敗しました。", errorCode, errorMessage);
+                util.showAlert('設定に失敗しました。', errorCode, errorMessage);
             });
         });
     }
     parent.onChangeOption = onChangeOption;
 
+    
+     function backLink() {
+        stopPreview(function() {
+            history.back();
+        });
+     }
+    parent.backLink = backLink;
+
+    window.onbeforeunload = function(e) {
+        onStopPreview();
+        return;
+    };
+
     return parent;
 })(demoTakePhoto || {}, this.self || global);
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_vibration.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_vibration.js
index fa0ebf46..d6c4ad70 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_vibration.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/demo_vibration.js
@@ -24,10 +24,8 @@ var demoVibration = (function(parent, global) {
         builder.setAttribute('vibrate');
         builder.setServiceId(mServiceId);
         builder.setAccessToken(util.getAccessToken());
-//         builder.addParameter('pattern', getVibrationPattern());
         var uri = builder.build();
         dConnect.put(uri, null, null, function(json) {
-            console.log(json);
         }, function(errorCode, errorMessage) {
             util.showAlert("バイブレーションの開始に失敗しました。", errorCode, errorMessage);
         });
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/util.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/util.js
index 2433cec1..abe6990f 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/util.js
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/js/util.js
@@ -71,20 +71,15 @@ var util = (function(parent, global) {
     }
 
     function openWebSocketIfNeeded() {
-       try {
-            if (!dConnect.isConnectedWebSocket()) {
-                var accessToken = mAccessToken ? mAccessToken : mSessionKey;
-                dConnect.connectWebSocket(accessToken, function(code, message) {
-                     if (code > 0) {
-                          alert('WebSocketが切れました。\n code=' + code + " message=" + message);
-                     }
-                     console.log("WebSocket: code=" + code + " message=" +message);
-                 });
-            }
-        } catch (e) {
-            alert("この端末は、WebSocketをサポートしていません。");
+        if (!dConnect.isConnectedWebSocket()) {
+            var accessToken = mAccessToken ? mAccessToken : mSessionKey;
+            dConnect.connectWebSocket(accessToken, function(code, message) {
+                if (code > 0) {
+                    alert('WebSocketが切れました。\n code=' + code + " message=" + message);
+                }
+                console.log("WebSocket: code=" + code + " message=" +message);
+            });
         }
-
     }
 
     function findHostDevicePlugin(callback) {
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_install.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_install.html
deleted file mode 100644
index 48be8490..00000000
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_install.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
-        <link rel="stylesheet" href="../css/main.css" type="text/css" />
-        <title>HOSTプラグインのインストール</title>
-    </head>
-    <body>
-        <div class="heading">HOSTプラグインのインストール</div>
-        <div class="content">
-
-        </div>
-    </body>
-</html>
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_tutorial.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_tutorial.html
index b2121442..b3e38079 100644
--- a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_tutorial.html
+++ b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/host_tutorial.html
@@ -1,23 +1,26 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" href="../css/main.css" type="text/css" />
-    <title>HOSTプラグインを利用する</title>
+    <title>HOSTデバイスプラグインを利用する</title>
 </head>
 <body>
-<div class="title" align="left" style="float:left;">
+<div class="heading" align="left" style="float:left;color=#FFFFFF;">
     <a class="back" href="javascript:history.back();">＜</a>
 </div>
-<div class="title" align="center">HOSTプラグインを利用する</div>
+<div class="heading">HOSTデバイスプラグインを利用する</div>
 <div class="content">
-    <ul>
+    <ul class="menu">
         <li><a href="demo/demo_battery.html">バッテリー残量を見る</a></li>
         <li><a href="demo/demo_acceleration.html">加速度センサーの値を見る</a></li>
         <li><a href="demo/demo_take_photo.html">写真を撮影する</a></li>
         <li><a href="demo/demo_vibration.html">バイブレーション</a></li>
     </ul>
 </div>
+<div class="link">
+    <a href="../index.html">ヘルプTOPページ</a>
+</div>
 </body>
 </html>