diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMCallLocalView.h b/HyphenateSDK/HyphenateFull-SDK/include/EMCallLocalView.h
index cd3e2a9..c087450 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMCallLocalView.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMCallLocalView.h
@@ -3,7 +3,7 @@
 //  HyphenateSDK
 //
 //  Created by XieYajie on 2/29/16.
-//  Copyright © 2016 easemob.com. All rights reserved.
+//  Copyright © 2016 Hyphenate.io. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -13,10 +13,10 @@
 /*!
  *  Initialization LocalView
  *
- *  @param frame    frame of localView
- *  @param sessionPreset    output resolution,only support AVCaptureSessionPreset352x288 and AVCaptureSessionPreset640x480
+ *  @param frame    Frame of localView
+ *  @param sessionPreset    AVCaptureSession output resolution, currently support AVCaptureSessionPreset352x288 and AVCaptureSessionPreset640x480
  *
- *  @result Get instance of LocalView
+ *  @result     Returns a LocalView instance
  */
 - (instancetype)initWithFrame:(CGRect)frame withSessionPreset:(NSString*)aSessionPreset;
 
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMCallManagerDelegate.h b/HyphenateSDK/HyphenateFull-SDK/include/EMCallManagerDelegate.h
index f105a44..5b9bea5 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMCallManagerDelegate.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMCallManagerDelegate.h
@@ -1,6 +1,6 @@
 /*!
  *  @header EMCallManagerDelegate.h
- *  @abstract This protocol defined the callbacks of real time voice/video
+ *  @abstract This protocol defines the callbacks of voice/video calling
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -19,55 +19,59 @@
 @optional
 
 /*!
- *  User B will receive this callback after user A dial user B
+ *  Delegate method will be invoked when receiving a call.
+ *  User B will receive this callback after user A dial user B.
  *
  *  @param aSession  Session instance
  */
-- (void)didReceiveCallIncoming:(EMCallSession *)aSession;
+- (void)callDidReceive:(EMCallSession *)aSession;
 
 /*!
- *  Both user A and B will receive this callback after connection is established
+ *  Delegate method invokes when the connection is established.
+ *  Both user A and B will receive this callback.
  *
  *  @param aSession  Session instance
  */
-- (void)didReceiveCallConnected:(EMCallSession *)aSession;
+- (void)callDidConnect:(EMCallSession *)aSession;
 
 /*!
- *  User A will receive this callback after user B accept A's call
+ *  Delegate method invokes when the outgoing call is accepted by the recipient. 
+ *  User A will receive this callback after user B accept A's call.
  *
- *  @param aSession
+ *  @param Session instance
  */
-- (void)didReceiveCallAccepted:(EMCallSession *)aSession;
+- (void)callDidAccept:(EMCallSession *)aSession;
 
 /*!
- *  1.The another peer will receive this callback after user A or user B terminate the call.
- *  2.Both user A and B will receive this callback after error occur.
+ *  Delegate method invokes when the other party ends the call or some error happens.
+ *  1.The another party will receive this callback after user A or user B end the call.
+ *  2.Both user A and B will receive this callback after error occured.
  *
  *  @param aSession  Session instance
- *  @param aReason   Terminate reason
- *  @param aError    Error
+ *  @param aOption   The reason of ending the call
+ *  @param aError    EMError
  */
-- (void)didReceiveCallTerminated:(EMCallSession *)aSession
-                          reason:(EMCallEndReason)aReason
-                           error:(EMError *)aError;
+- (void)callDidEnd:(EMCallSession *)aSession
+            reason:(EMCallEndReason)aReason
+             error:(EMError *)aError;
 
 /*!
- *  User A and B is on the call, A pause or resume the data stream, B will receive the callback
+ *  Delegate method invokes when the other party pauses or resumes the call.
+ *  User A and B are on the same call, A pauses or resumes the call, B will receive this callback.
  *
  *  @param aSession  Session instance
- *  @param aType     Type
+ *  @param aType     Current call status
  */
-- (void)didReceiveCallUpdated:(EMCallSession *)aSession
-                         type:(EMCallStreamControlType)aType;
+- (void)callStateDidChange:(EMCallSession *)aSession
+                      type:(EMCallStreamingStatus)aType;
 
 /*!
- *  User A and B is on the call, A network status is not stable, A will receive the callback
+ *  Delegate method invokes when the local network status changes.
+ *  User A and B are on the same call, A's network status changes from active to unstable or unavailable, and A will receive the callback.
  *
  *  @param aSession  Session instance
- *  @param aStatus   Current status
+ *  @param aStatus   Current network status
  */
-- (void)didReceiveCallNetworkChanged:(EMCallSession *)aSession
-                              status:(EMCallNetworkStatus)aStatus;
-
-
+- (void)callNetworkStatusDidChange:(EMCallSession *)aSession
+                            status:(EMCallNetworkStatus)aStatus;
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMCallRemoteView.h b/HyphenateSDK/HyphenateFull-SDK/include/EMCallRemoteView.h
index dfbe74c..016f1e0 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMCallRemoteView.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMCallRemoteView.h
@@ -3,7 +3,7 @@
 //  HyphenateSDK
 //
 //  Created by XieYajie on 2/29/16.
-//  Copyright © 2016 easemob.com. All rights reserved.
+//  Copyright © 2016 Hyphenate.io. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMCallSession.h b/HyphenateSDK/HyphenateFull-SDK/include/EMCallSession.h
index 42509fe..9abe3d5 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMCallSession.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMCallSession.h
@@ -14,59 +14,59 @@
  *  Call session status
  */
 typedef enum{
-    EMCallSessionStatusDisconnected = 0,    /*! Disconnected */
-    EMCallSessionStatusRinging,             /*! Callee is Ringing */
-    EMCallSessionStatusConnecting,          /*! It's ready, wait to answer */
-    EMCallSessionStatusConnected,           /*! Connection is established */
-    EMCallSessionStatusAccepted,            /*! Accepted */
+    EMCallSessionStatusDisconnected = 0,    /*!  Disconnected */
+    EMCallSessionStatusRinging,             /*!  Callee is Ringing */
+    EMCallSessionStatusConnecting,          /*!  Waiting for the recipient to pickup */
+    EMCallSessionStatusConnected,           /*!  Connection is established */
+    EMCallSessionStatusAccepted,            /*!  Accepted */
 }EMCallSessionStatus;
 
 /*!
  *  Call type
  */
 typedef enum{
-    EMCallTypeVoice = 0,    /*! Voice call */
-    EMCallTypeVideo,        /*! Video call */
+    EMCallTypeVoice = 0,    /*!  Voice call */
+    EMCallTypeVideo,        /*!  Video call */
 }EMCallType;
 
 /*!
- *  Call end reason
+ *  Call end cause
  */
 typedef enum{
-    EMCallEndReasonHangup   = 0,    /*! Another peer hang up */
-    EMCallEndReasonNoResponse,      /*! No response */
-    EMCallEndReasonDecline,         /*! Another peer declined the call */
-    EMCallEndReasonBusy,            /*! User is busy */
-    EMCallEndReasonFailed,          /*! Establish the call failed */
+    EMCallEndReasonHangup   = 0,    /*!  The recipient hung up */
+    EMCallEndReasonNoResponse,      /*!  No response from recipient */
+    EMCallEndReasonDecline,         /*!  The recipient declined the call */
+    EMCallEndReasonBusy,            /*!  The recipient was busy */
+    EMCallEndReasonFailed,          /*!  Failed to establishing the connection */
 }EMCallEndReason;
 
 /*!
- *  Connection type of the call
+ *  Call connection type
  */
 typedef enum{
-    EMCallConnectTypeNone = 0,  /*! None */
-    EMCallConnectTypeDirect,    /*! Direct connect */
-    EMCallConnectTypeRelay,     /*! Relay connect */
+    EMCallConnectTypeNone = 0,  /*!  No connection */
+    EMCallConnectTypeDirect,    /*!   Direct connection */
+    EMCallConnectTypeRelay,     /*!  Relay connection */
 }EMCallConnectType;
 
 
 /*!
- *  Stream control
+ *  Call status
  */
 typedef enum{
-    EMCallStreamControlTypeVoicePause = 0,  /*! Pause Voice */
-    EMCallStreamControlTypeVoiceResume,     /*! Resume Voice */
-    EMCallStreamControlTypeVideoPause,      /*! Pause Video */
-    EMCallStreamControlTypeVideoResume,     /*! Resume Video */
-}EMCallStreamControlType;
+    EMCallStreamStatusVoicePause = 0,  /*!  Pause voice streaming */
+    EMCallStreamStatusVoiceResume,     /*!  Resume voice streaming */
+    EMCallStreamStatusVideoPause,      /*!  Pause video streaming */
+    EMCallStreamStatusVideoResume,     /*!  Resume video streaming */
+}EMCallStreamingStatus;
 
 /*!
- *  Network status
+ *  Call Network status
  */
 typedef enum{
-    EMCallNetworkStatusNormal = 0,  /*! Normal */
-    EMCallNetworkStatusUnstable,    /*! Unstable */
-    EMCallNetworkStatusNoData,      /*! No data */
+    EMCallNetworkStatusNormal = 0,  /*!  Network Available  */
+    EMCallNetworkStatusUnstable,    /*!  Network Unstable */
+    EMCallNetworkStatusNoData,      /*!  Network Unavailable */
 }EMCallNetworkStatus;
 
 /*!
@@ -86,7 +86,7 @@ typedef enum{
 @property (nonatomic, strong, readonly) NSString *username;
 
 /*!
- *  The other side's username
+ *  The other party's username
  */
 @property (nonatomic, strong, readonly) NSString *remoteUsername;
 
@@ -111,99 +111,104 @@ typedef enum{
 @property (nonatomic, strong) EMCallLocalView *localVideoView;
 
 /*!
- *  Remote display view
+ *  The other party's display view
  */
 @property (nonatomic, strong) EMCallRemoteView *remoteVideoView;
 
 /*!
- *  Set video bit rate, must set before start the session
+ *  Video bit rate, must be set before call session is started.
  *
- *  Value is 150-1000, the default is 600
+ *  Value range is 150-1000, the default is 600.
  */
 @property (nonatomic) int videoBitrate;
 
 /*!
- *  Get voice volume
+ *  Get voice volume of the call
  *
  *  @return Volume
  */
 - (int)getVoiceVolume;
 
 /*!
- *  Get video delay time, in milliseconds, it's real time changed
+ *  Get video latency, in milliseconds, changing in real time
  *
  *  @result The delay time
  */
-- (int)getVideoTimedelay;
+- (int)getVideoLatency;
 
 /*!
- *  Get video frame rate, it's real time changed
+ *  Get video frame rate, changing in real time
  *
- *  @result The frame rate
+ *  @result The video frame rate
  */
-- (int)getVideoFramerate;
+- (int)getVideoFrameRate;
 
 /*!
  *  Get video package lost rate
  *
- *  @result Package lost rate
+ *  @result Video package lost rate
  */
-- (int)getVideoLostcnt;
+- (int)getVideoLostRateInPercent;
 
 /*!
- *  Get video width, fix size, it's not real time changed
+ *  Get video original width
  *
- *  @result Video width
+ *  @result Video original width
  */
 - (int)getVideoWidth;
 
 /*!
- *  Get video height, fix size, it's not real time changed
+ *  Get fixed video original height
  *
- *  @result Video height
+ *  @result Video original height
  */
 - (int)getVideoHeight;
 
 /*!
- *  Get another peer's bitrate, it's real time changed
+ *  Get the other party's bitrate, changing in real time
  *
- *  @result Another peer's bitrate
+ *  @result The other party's bitrate
  */
 - (int)getVideoRemoteBitrate;
 
 /*!
- *  Get bitrate of video call, it's real time changed
+ *  Get bitrate of video call, changing in real time
  *
- *  @result Bitrate of video
+ *  @result Bitrate of video call
  */
 - (int)getVideoLocalBitrate;
 
 /*!
- *  Get snapshot of video
+ *  Get a snapshot of current video screen as jpeg picture and save to the local file system.
  *
- *  @param aFullPath  Save path of picture
+ *  @param aPath  Saved path of picture
  */
-- (void)takeRemotePicture:(NSString *)aFullPath;
+- (void)screenCaptureToFilePath:(NSString *)aPath error:(EMError**)pError;
 
 /*!
  *  Start recording video
  *
- *  @param  aPath    File save path
+ *  @param aPath            File saved path
+ *  @param aError           Error
+
+ *
  */
-- (BOOL)startVideoRecord:(NSString*)aPath;
+- (void)startVideoRecordingToFilePath:(NSString*)aPath
+                                error:(EMError**)aError;
 
 /*!
  *  Stop recording video
  *
- *  @result path of record file
+ *  @param aError           Error
+ *
  */
-- (NSString *)stopVideoRecord;
+- (NSString *)stopVideoRecording:(EMError**)aError;
 
 /*!
- *  Use front camera or back camera,default use front
+ *  Use front camera or back camera, default use front
  *
- *  @param  isFont    Weather use front camera or not,Yes is Front,No is Back
+ *  @param  aIsFrontCamera    YES for front camera, NO for back camera.
  */
-- (void)setCameraBackOrFront:(BOOL)isFont;
+- (void)switchCameraPosition:(BOOL)aIsFrontCamera;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMChatManagerDelegate.h b/HyphenateSDK/HyphenateFull-SDK/include/EMChatManagerDelegate.h
index 02bc5bc..5817399 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMChatManagerDelegate.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMChatManagerDelegate.h
@@ -1,6 +1,6 @@
 /*!
  *  @header EMChatManagerDelegate.h
- *  @abstract This protocol defined the callbacks of chat
+ *  @abstract This protocol defines chat related callbacks
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -20,58 +20,57 @@
 #pragma mark - Conversation
 
 /*!
- *  The conversation list has changed
+ *  Delegate method will be invoked when the conversation list has changed
  *
  *  @param aConversationList  Conversation list<EMConversation>
  */
-- (void)didUpdateConversationList:(NSArray *)aConversationList;
+- (void)conversationListDidUpdate:(NSArray *)aConversationList;
 
 #pragma mark - Message
 
 /*!
- *  Received messages
+ *  Delegate method will be invoked when receiving new messages
  *
- *  @param aMessages  Message list<EMMessage>
+ *  @param aMessages  Receivecd message list<EMMessage>
  */
-- (void)didReceiveMessages:(NSArray *)aMessages;
+- (void)messagesDidReceive:(NSArray *)aMessages;
 
 /*!
- *  Received cmd messages
+ *  Delegate method will be invoked when receiving command messages
  *
- *  @param aCmdMessages  Cmd message list<EMMessage>
+ *  @param aCmdMessages  Command message list<EMMessage>
  */
-- (void)didReceiveCmdMessages:(NSArray *)aCmdMessages;
+- (void)cmdMessagesDidReceive:(NSArray *)aCmdMessages;
 
 /*!
- *  Received read acks
+ *   Delegate method will be invoked when receiving read acknowledgements for message list
  *
- *  @param aMessages  Read acked message list<EMMessage>
+ *  @param aMessages  Acknowledged message list<EMMessage>
  */
-- (void)didReceiveHasReadAcks:(NSArray *)aMessages;
+- (void)messagesDidRead:(NSArray *)aMessages;
 
 /*!
- *  Received deliver acks
+ * Delegate method will be invoked when receiving deliver acknowledgements for message list
  *
- *  @param aMessages  Deliver acked message list<EMMessage>
+ *  @param aMessages  Acknowledged message list<EMMessage>
  */
-- (void)didReceiveHasDeliveredAcks:(NSArray *)aMessages;
+- (void)messagesDidDeliver:(NSArray *)aMessages;
 
 /*!
- *  Message status has changed
+ *  Delegate method will be invoked when message status has changed
  *
- *  @param aMessage  Message whose status changed
+ *  @param aMessage  Message whose status has changed
  *  @param aError    Error info
  */
-- (void)didMessageStatusChanged:(EMMessage *)aMessage
-                          error:(EMError *)aError;
+- (void)messageStatusDidChange:(EMMessage *)aMessage
+                         error:(EMError *)aError;
 
 /*!
- *  Attachment status has changed
+ *  Delegate method will be invoked when message attachment status has changed
  *
- *  @param aMessage  Message whose attachment status changed
+ *  @param aMessage  Message attachment status has changed
  *  @param aError    Error
  */
-- (void)didMessageAttachmentsStatusChanged:(EMMessage *)aMessage
-                                     error:(EMError *)aError;
-
+- (void)messageAttachmentStatusDidChange:(EMMessage *)aMessage
+                                   error:(EMError *)aError;
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMChatroom.h b/HyphenateSDK/HyphenateFull-SDK/include/EMChatroom.h
index d00806f..c578ea1 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMChatroom.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMChatroom.h
@@ -8,29 +8,47 @@
 #import <Foundation/Foundation.h>
 
 /*!
- *  Chatroom
+ *  Chat room object
  */
 @interface EMChatroom : NSObject
 
 /*!
- *  Chatroom id
+ *  Chat room id
  */
 @property (nonatomic, copy, readonly) NSString *chatroomId;
 
 /*!
- *  Subject of chatroom
+ *  Subject of chat room
  */
 @property (nonatomic, copy, readonly) NSString *subject;
 
 /*!
- *  Description of chatroom
+ *  Description of chat room
  */
 @property (nonatomic, copy, readonly) NSString *description;
 
 /*!
- *  The maximum number of members
+ *  Owner of the chat room. Only one owner per chat room. 
  */
-@property (nonatomic, readonly) NSInteger maxOccupantsCount;
+@property (nonatomic, copy, readonly) NSString *owner;
+
+/*!
+ *  The total number of members in the chat room
+ */
+@property (nonatomic, readonly) NSInteger occupantsCount __deprecated_msg("Use - membersCount");
+@property (nonatomic, readonly) NSInteger membersCount;
+
+/*!
+ *  The capacity of the chat room
+ */
+@property (nonatomic, readonly) NSInteger maxOccupantsCount __deprecated_msg("Use - maxMembersCount");
+@property (nonatomic, readonly) NSInteger maxMembersCount;
+
+/*!
+ *  List of members in the chat room
+ */
+@property (nonatomic, copy, readonly) NSArray *occupants __deprecated_msg("Use - members");
+@property (nonatomic, copy, readonly) NSArray *members;
 
 /*!
  *  Initialize chatroom instance
@@ -42,7 +60,7 @@
 - (instancetype)init __deprecated_msg("Use +chatroomWithId:");
 
 /*!
- *  Create chatroom instance
+ *  Construct a chatroom instance with chatroom id
  *
  *  @param aChatroomId   Chatroom id
  *
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMChatroomManagerDelegate.h b/HyphenateSDK/HyphenateFull-SDK/include/EMChatroomManagerDelegate.h
index b916dca..b300669 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMChatroomManagerDelegate.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMChatroomManagerDelegate.h
@@ -8,11 +8,11 @@
 #import <Foundation/Foundation.h>
 
 /*!
- *  The reason of be kicked out from chatroom
+ *  The casuse for kicking a user out of a chatroom
  */
 typedef enum{
-    EMChatroomBeKickedReasonBeRemoved = 0,  /*! Removed by owner  */
-    EMChatroomBeKickedReasonDestroyed,      /*! Chatroom has been destroyed */
+    EMChatroomBeKickedReasonBeRemoved = 0,  /*!  Removed by chatroom owner  */
+    EMChatroomBeKickedReasonDestroyed,      /*!  Chatroom has been destroyed */
 }EMChatroomBeKickedReason;
 
 @class EMChatroom;
@@ -25,31 +25,29 @@ typedef enum{
 @optional
 
 /*!
- *  A user joined chatroom
+ *  Delegate method will be invoked when a user joins a chatroom.
  *
  *  @param aChatroom    Joined chatroom
  *  @param aUsername    The user who joined chatroom
  */
-- (void)didReceiveUserJoinedChatroom:(EMChatroom *)aChatroom
-                            username:(NSString *)aUsername;
+- (void)userDidJoinChatroom:(EMChatroom *)aChatroom
+                       user:(NSString *)aUsername;
 
 /*!
- *  A user leaved chatroom
+ *  Delegate method will be invoked when a user leaves a chatroom.
  *
- *  @param aChatroom    Leaved chatroom
+ *  @param aChatroom    Left chatroom
  *  @param aUsername    The user who leaved chatroom
  */
-- (void)didReceiveUserLeavedChatroom:(EMChatroom *)aChatroom
-                            username:(NSString *)aUsername;
+- (void)userDidLeaveChatroom:(EMChatroom *)aChatroom
+                        user:(NSString *)aUsername;
 
 /*!
- *  User was kicked out from a chatroom
+ *  Delegate method will be invoked when a user is dismissed from a chat room
  *
- *  @param aChatroom    The chatroom which user was kicked out from
- *  @param aReason      The reason of user was kicked out
+ *  @param aChatroom    aChatroom
+ *  @param aReason      The reason of dismissing user from the chat room
  */
-- (void)didReceiveKickedFromChatroom:(EMChatroom *)aChatroom
-                              reason:(EMChatroomBeKickedReason)aReason;
-
-
+- (void)didDismissFromChatroom:(EMChatroom *)aChatroom
+                        reason:(EMChatroomBeKickedReason)aReason;
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMClient.h b/HyphenateSDK/HyphenateFull-SDK/include/EMClient.h
index 7bb892a..2aeb63f 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMClient.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMClient.h
@@ -31,7 +31,7 @@
 @property (nonatomic, strong, readonly) NSString *version;
 
 /*!
- *  Current logined account
+ *  Current logged in user's username
  */
 @property (nonatomic, strong, readonly) NSString *currentUsername;
 
@@ -41,47 +41,47 @@
 @property (nonatomic, strong, readonly) EMOptions *options;
 
 /*!
- *  Apple APNS setting
+ *  Apple Push Notification Service setting
  */
 @property (nonatomic, strong, readonly) EMPushOptions *pushOptions;
 
 /*!
- *  Chat module
+ *  Chat Management
  */
 @property (nonatomic, strong, readonly) id<IEMChatManager> chatManager;
 
 /*!
- *  Contact module
+ *  Contact Management
  */
 @property (nonatomic, strong, readonly) id<IEMContactManager> contactManager;
 
 /*!
- *  Group module
+ *  Group Management
  */
 @property (nonatomic, strong, readonly) id<IEMGroupManager> groupManager;
 
 /*!
- *  Chatroom module
+ *  Chat room Management
  */
 @property (nonatomic, strong, readonly) id<IEMChatroomManager> roomManager;
 
 /*!
- *  Whether SDK will automatically login last logined account
+ *  If SDK will automatically log into with previously logged in session
  */
 @property (nonatomic, readonly) BOOL isAutoLogin;
 
 /*!
- *  Whether user has logged in
+ *  If a user logged in
  */
 @property (nonatomic, readonly) BOOL isLoggedIn;
 
 /*!
- *  Whether has connected to chat server
+ *  Connection status to Hyphenate IM server
  */
 @property (nonatomic, readonly) BOOL isConnected;
 
 /*!
- *  Get SDK single instance
+ *  Get SDK singleton instance
  */
 + (instancetype)sharedClient;
 
@@ -91,11 +91,18 @@
  *  Add delegate
  *
  *  @param aDelegate  Delegate
- *  @param aQueue     The queue of call delegate method
+ *  @param aQueue     The queue of calling delegate methods
  */
 - (void)addDelegate:(id<EMClientDelegate>)aDelegate
       delegateQueue:(dispatch_queue_t)aQueue;
 
+/*!
+ *  Add delegate
+ *
+ *  @param aDelegate  Delegate
+ */
+- (void)addDelegate:(id<EMClientDelegate>)aDelegate;
+
 /*!
  *  Remove delegate
  *  
@@ -106,7 +113,7 @@
 #pragma mark - Initialize SDK
 
 /*!
- *  Initialization sdk
+ *  Initialize the SDK
  *  
  *  @param aOptions  SDK setting options
  *
@@ -114,125 +121,102 @@
  */
 - (EMError *)initializeSDKWithOptions:(EMOptions *)aOptions;
 
-
 /*!
- *  Register a new user
+ *  Register a new IM user
  *
- *  It is not recommended, advise to register new user through REST API
+ *  To enhance the reliability, registering new IM user through REST API from backend is highly recommended
  *
  *  @param aUsername        Username
  *  @param aPassword        Password
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncRegisterWithUsername:(NSString *)aUsername
-                         password:(NSString *)aPassword
-                          success:(void (^)())aSuccessBlock
-                          failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)registerWithUsername:(NSString *)aUsername
+                    password:(NSString *)aPassword
+                  completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
  *  Login
  *
  *  @param aUsername        Username
  *  @param aPassword        Password
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncLoginWithUsername:(NSString *)aUsername
-                      password:(NSString *)aPassword
-                       success:(void (^)())aSuccessBlock
-                       failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)loginWithUsername:(NSString *)aUsername
+                 password:(NSString *)aPassword
+               completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
  *  Logout
  *
- *  @param aIsUnbindDeviceToken Whether unbind device token, device will don't receive message push after unbind token, if input YES, unbind failed will return error
+ *  @param aIsUnbindDeviceToken Unbind device token to disable the Apple Push Notification Service
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Error
  */
-- (void)asyncLogout:(BOOL)aIsUnbindDeviceToken
-            success:(void (^)())aSuccessBlock
-            failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)logout:(BOOL)aIsUnbindDeviceToken
+    completion:(void (^)(EMError *aError))aCompletionBlock;
 
 /*!
- *  Bind device token
+ *  Device token binding is required to enable Apple push notification service
  *
  *  @param aDeviceToken     Device token to bind
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  */
-- (void)asyncBindDeviceToken:(NSData *)aDeviceToken
-                     success:(void (^)())aSuccessBlock
-                     failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)registerForRemoteNotificationsWithDeviceToken:(NSData *)aDeviceToken
+                                           completion:(void (^)(EMError *aError))aCompletionBlock;
 
 /*!
- *  Set nick name to show in push message
+ *  Set display name for the push notification
  *
- *  @param aNickname        Nickname
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aDisplayName     Display name of push
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncSetApnsNickname:(NSString *)aNickname
-                     success:(void (^)())aSuccessBlock
-                     failure:(void (^)(EMError *aError))aFailureBlock;
-
+- (void)updatePushNotifiationDisplayName:(NSString *)aDisplayName
+                              completion:(void (^)(NSString *aDisplayName, EMError *aError))aCompletionBlock;
 /*!
- *  Get apns options from the server
+ *  Get Apple Push Notification Service options from the server
  *
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  */
-- (void)asyncGetPushOptionsFromServer:(void (^)(EMPushOptions *aOptions))aSuccessBlock
-                              failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getPushNotificationOptionsFromServerWithCompletion:(void (^)(EMPushOptions *aOptions, EMError *aError))aCompletionBlock;
 
 /*!
- *  Update APNS options to the server
- *
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  Update Apple Push Notification Service options to the server
  *
+ *  @param aCompletionBlock The callback block of completion
  */
-- (void)asyncUpdatePushOptionsToServer:(void (^)())aSuccessBlock
-                               failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)updatePushNotificationOptionsToServerWithCompletion:(void (^)(EMError *aError))aCompletionBlock;
 
 /*!
  *  Upload log to server
  *
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  */
-- (void)asyncUploadLogToServer:(void (^)())aSuccessBlock
-                       failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)uploadDebugLogToServerWithCompletion:(void (^)(EMError *aError))aCompletionBlock;
 
 #pragma mark - iOS
 
 /*!
- *  iOS-specific, data migration to SDK3.0
+ *  Migrate the IM database to the latest SDK version
  *
- *  Synchronization method will block the current thread
- *
- *  It's needed to call this method when update to SDK3.0, developers need to wait this method complete before DB related operations
- *
- *  @result Whether migration successful
+ *  @result Return YES for success
  */
-- (BOOL)dataMigrationTo3;
+- (BOOL)migrateDatabaseToLatestSDK;
 
 /*!
- *  iOS only, should call this method to disconnect from server when app enter backgroup
+ *  Disconnect from server when app enters background
  *
  *  @param aApplication  UIApplication
  */
 - (void)applicationDidEnterBackground:(id)aApplication;
 
 /*!
- *  iOS only, should call this method to re-connect to server when app restore to foreground
+ *  Re-connect to server when app enters foreground
  *
  *  @param aApplication  UIApplication
  */
 - (void)applicationWillEnterForeground:(id)aApplication;
 
-
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMClientDelegate.h b/HyphenateSDK/HyphenateFull-SDK/include/EMClientDelegate.h
index e905683..08081ee 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMClientDelegate.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMClientDelegate.h
@@ -11,8 +11,8 @@
  *  Network Connection Status
  */
 typedef enum{
-    EMConnectionConnected = 0,  /*! Connected */
-    EMConnectionDisconnected,   /*! Not connected */
+    EMConnectionConnected = 0,  /*! * Connected */
+    EMConnectionDisconnected,   /*! * Not connected */
 }EMConnectionState;
 
 @class EMError;
@@ -25,31 +25,27 @@ typedef enum{
 @optional
 
 /*!
- *  Connection to the server status changes will receive the callback
- *  
- *  calling the method causes:
- *  1. After successful login, the phone can not access
- *  2. After a successful login, network status change
- *  
+ *  Delegate method will be invoked when server connection state has changed
+ *
  *  @param aConnectionState Current state
  */
-- (void)didConnectionStateChanged:(EMConnectionState)aConnectionState;
+- (void)connectionStateDidChange:(EMConnectionState)aConnectionState;
 
 /*!
- *  Callback Automatic login fails
+ *  Delegate method will be invoked when auto login is completed
  *
  *  @param aError Error
  */
-- (void)didAutoLoginWithError:(EMError *)aError;
+- (void)autoLoginDidCompleteWithError:(EMError *)aError;
 
 /*!
- *  Current login account to log in on other devices will receive the callback
+ *  Delegate method will be invoked when current IM account logged into another device
  */
-- (void)didLoginFromOtherDevice;
+- (void)userAccountDidLoginFromOtherDevice;
 
 /*!
- *  Current login account will receive the callback is deleted from the server
+ *  Delegate method will be invoked when current IM account is removed from server
  */
-- (void)didRemovedFromServer;
+- (void)userAccountDidRemoveFromServer;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMCmdMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMCmdMessageBody.h
index 04f6750..7dbcd33 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMCmdMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMCmdMessageBody.h
@@ -20,12 +20,12 @@
 @property (nonatomic, copy) NSString *action;
 
 /*!
- *  Command parameters, only for compatable with old version, use EMMessage's extend attribute instead
+ *  Command parameters, only compatable with old sdk versions. For SDK version 3.0+, use EMMessage's ext property instead
  */
 @property (nonatomic, copy) NSArray *params;
 
 /*!
- *  Initialize command message body
+ *  Construct command message body
  *
  *  @param aAction  Action content
  *
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMContactManagerDelegate.h b/HyphenateSDK/HyphenateFull-SDK/include/EMContactManagerDelegate.h
index 8a8b26d..0084c10 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMContactManagerDelegate.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMContactManagerDelegate.h
@@ -17,41 +17,50 @@
 @optional
 
 /*!
- *  User A will receive this callback after user B agreed user A's add-friend invitation
- *
- *  @param aUsername   User B
+ *  Delegate method will be invoked is a friend request is approved.
+ *   
+ *  User A will receive this callback after user B approved user A's friend request
+ *  @param aUsername   User who approves the friend's request
  */
-- (void)didReceiveAgreedFromUsername:(NSString *)aUsername;
+- (void)friendRequestDidApproveByUser:(NSString *)aUsername;
 
 /*!
- *  User A will receive this callback after user B declined user A's add-friend invitation
+ *  Delegate method will be invoked if a friend request is declined.
+ *
+ *  User A will receive this callback after user B declined user A's friend request
  *
- *  @param aUsername   User B
+ *  @param aUsername   User who declined the friend's request
  */
-- (void)didReceiveDeclinedFromUsername:(NSString *)aUsername;
+- (void)friendRequestDidDeclineByUser:(NSString *)aUsername;
 
 /*!
- *  User A will receive this callback after User B delete the friend relationship between user A
+ 
+ *  Delegate method will be invoked if user is removed as a contact by another user
+ *
+ *  User A will receive this callback after User B unfriended with user A
  *
- *  @param aUsername   User B
+ *  @param aUsername   User who unfriended the cureent user
  */
-- (void)didReceiveDeletedFromUsername:(NSString *)aUsername;
+- (void)friendshipDidRemoveByUser:(NSString *)aUsername;
 
 /*!
+ *  Delegate method will be invoked id the user is added as a contact by another user.
+ *
  *  Both user A and B will receive this callback after User B agreed user A's add-friend invitation
  *
  *  @param aUsername   Another user of user‘s friend relationship
  */
-- (void)didReceiveAddedFromUsername:(NSString *)aUsername;
+- (void)friendshipDidAddByUser:(NSString *)aUsername;
 
 /*!
- *  User A will receive this callback after user B requested to add user A as a friend
+ *  Delegate method will be invoked when user receives a friend request
+ *
+ *  User A will receive this callback when receiving a friend request from user B
  *
- *  @param aUsername   User B
- *  @param aMessage    Friend invitation message
+ *  @param aUsername   Friend request sender
+ *  @param aMessage    Friend request message
  */
-- (void)didReceiveFriendInvitationFromUsername:(NSString *)aUsername
-                                       message:(NSString *)aMessage;
-
+- (void)friendRequestDidReceiveFromUser:(NSString *)aUsername
+                                message:(NSString *)aMessage;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMConversation.h b/HyphenateSDK/HyphenateFull-SDK/include/EMConversation.h
index 932b23f..61e0410 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMConversation.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMConversation.h
@@ -13,20 +13,21 @@
  *  Conversation type
  */
 typedef enum{
-    EMConversationTypeChat  = 0,    /*! Chat */
-    EMConversationTypeGroupChat,    /*! Group chat */
-    EMConversationTypeChatRoom      /*! Chatroom chat */
+    EMConversationTypeChat  = 0,    /*!  one to one chat room type */
+    EMConversationTypeGroupChat,    /*!  Group chat room type */
+    EMConversationTypeChatRoom      /*!  Chatroom chat room type */
 } EMConversationType;
 
 /*
  *  Message search direction
  */
 typedef enum{
-    EMMessageSearchDirectionUp  = 0,    /*! Search older messages */
-    EMMessageSearchDirectionDownload    /*! Search newer messages */
+    EMMessageSearchDirectionUp  = 0,    /*!  Search older messages */
+    EMMessageSearchDirectionDown        /*!  Search newer messages */
 } EMMessageSearchDirection;
 
 @class EMMessage;
+@class EMError;
 
 /*!
  *  Chat conversation
@@ -49,7 +50,7 @@ typedef enum{
 @property (nonatomic, assign, readonly) int unreadMessagesCount;
 
 /*!
- *  Conversation extend property
+ *  Conversation extension property
  */
 @property (nonatomic, copy) NSDictionary *ext;
 
@@ -59,137 +60,149 @@ typedef enum{
 @property (nonatomic, strong, readonly) EMMessage *latestMessage;
 
 /*!
- *  Insert a message to conversation, message's conversationId should equle to conversation's conversationId, message will be inserted to DB, and update conversation's property
+ *  Insert a message to a conversation. ConversationId of the message should be the same as conversationId of the conversation in order to insert the message into the conversation correctly.
  *
- *  @param aMessage  Message
+ *  @param aMessage Message
+ *  @param pError   Error
+ */
+- (void)insertMessage:(EMMessage *)aMessage
+                error:(EMError **)pError;
+
+/*!
+ *  Insert a message to the end of a conversation. ConversationId of the message should be the same as conversationId of the conversation in order to insert the message into the conversation correctly.
+ *
+ *  @param aMessage Message
+ *  @param pError   Error
  *
- *  @result Message insert result, YES: success, No: fail
  */
-- (BOOL)insertMessage:(EMMessage *)aMessage;
+- (void)appendMessage:(EMMessage *)aMessage
+                error:(EMError **)pError;
 
 /*!
  *  Delete a message
  *
- *  @param aMessageId  Message's ID who will be deleted
+ *  @param aMessageId   MessageId of the message to be deleted
+ *  @param pError       Error
  *
- *  @result Message delete result, YES: success, No: fail
  */
-- (BOOL)deleteMessageWithId:(NSString *)aMessageId;
+- (void)deleteMessageWithId:(NSString *)aMessageId
+                      error:(EMError **)pError;
 
 /*!
- *  Delete all message of the conversation
- *
- *  @result Delete result, YES: success, No: fail
+ *  Delete all message of a conversation
+ *  @param pError       Error
  */
-- (BOOL)deleteAllMessages;
+- (void)deleteAllMessages:(EMError **)pError;
 
 /*!
- *  Update a message, can't update message's messageId, conversation's latestMessage and so on properties will update after update the message
+ *  Update a local message, conversation's latestMessage and other properties will be updated accordingly. Please note that messageId can not be updated.
  *
- *  @param aMessage  Message
+ *  @param aMessage Message
+ *  @param pError   Error
  *
- *  @result Message update result, YES: success, No: fail
  */
-- (BOOL)updateMessage:(EMMessage *)aMessage;
+- (void)updateMessageChange:(EMMessage *)aMessage
+                      error:(EMError **)pError;
 
 /*!
  *  Mark a message as read
  *
- *  @param aMessageId  Message's ID who will be set read status
+ *  @param aMessageId   MessageID
+ *  @param pError       Error
  *
- *  @result Result of mark message as read, YES: success, No: fail
  */
-- (BOOL)markMessageAsReadWithId:(NSString *)aMessageId;
+- (void)markMessageAsReadWithId:(NSString *)aMessageId
+                          error:(EMError **)pError;
 
 /*!
  *  Mark all message as read
  *
- *  @result Result of mark all message as read, YES: success, No: fail
+ *  @param pError   Error
+ *
  */
-- (BOOL)markAllMessagesAsRead;
+- (void)markAllMessagesAsRead:(EMError **)pError;
 
 /*!
- *  Update conversation extend properties to DB
+ *  Get a message with the ID
+ *
+ *  @param aMessageId       MessageID
+ *  @param pError           Error
  *
- *  @result Extend properties update result, YES: success, No: fail
  */
-- (BOOL)updateConversationExtToDB __deprecated_msg("setExt: will update extend properties to DB");
+- (EMMessage *)loadMessageWithId:(NSString *)aMessageId
+                           error:(EMError **)pError;
 
 /*!
- *  Get a message with the ID
- *
- *  @param aMessageId  Message's id
+ *  Get last received message
  *
  *  @result Message instance
  */
-- (EMMessage *)loadMessageWithId:(NSString *)aMessageId;
+- (EMMessage *)lastReceivedMessage;
+
+#pragma mark - Async method
 
 /*!
- *  Get more messages from DB, result messages are sorted by receive time, and NOT include the reference message, if reference messag's ID is nil, will fetch message from latest message
+ *  Load messages from a specified message, returning messages are sorted by receiving timestamp. If the aMessageId is nil, return the latest received messages.
  *
- *  @param aMessageId  Reference message's ID
- *  @param aLimit      Count of messages to load
- *  @param aDirection  Message search direction
+ *  @param aMessageId       Reference message's ID
+ *  @param aCount           Count of messages to load
+ *  @param aDirection       Message search direction
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Message list<EMMessage>
  */
-- (NSArray *)loadMoreMessagesFromId:(NSString *)aMessageId
-                              limit:(int)aLimit
-                          direction:(EMMessageSearchDirection)aDirection;
+- (void)loadMessagesStartFromId:(NSString *)aMessageId
+                          count:(int)aCount
+                searchDirection:(EMMessageSearchDirection)aDirection
+                     completion:(void (^)(NSArray *aMessages, EMError *aError))aCompletionBlock;
 
 /*!
- *  Get more messages with specified type from DB, result messages are sorted by received time, if reference timestamp is negative, will fetch message from latest message, andd will fetch all messages that meet the condition if aLimit is negative
+ *  Load messages with specified type, returning messages are sorted by receiving timestamp. If reference timestamp is negative, load from the latest messages; if message count is negative, load all messages that meet the condition.
  *
- *  @param aType        Message type to load
- *  @param aTimestamp   Reference timestamp
- *  @param aLimit       Count of messages to load
- *  @param aSender      Message sender, will ignore it if it's empty
- *  @param aDirection   Message search direction
+ *  @param aType            Message type to load
+ *  @param aTimestamp       Reference timestamp
+ *  @param aLimit           Count of messages to load
+ *  @param aUsername        Message sender (optional)
+ *  @param aDirection       Message search direction
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Message list<EMMessage>
  */
-- (NSArray *)loadMoreMessagesWithType:(EMMessageBodyType)aType
-                               before:(long long)aTimestamp
-                                limit:(int)aLimit
-                                 from:(NSString*)aSender
-                            direction:(EMMessageSearchDirection)aDirection;
+- (void)loadMessagesWithType:(EMMessageBodyType)aType
+                   timestamp:(long long)aTimestamp
+                       count:(int)aCount
+                    fromUser:(NSString*)aUsername
+             searchDirection:(EMMessageSearchDirection)aDirection
+                  completion:(void (^)(NSArray *aMessages, EMError *aError))aCompletionBlock;
 
 /*!
- *  Get more messages contain specified keywords from DB, result messages are sorted by received time, if reference timestamp is negative, will fetch message from latest message, andd will fetch all messages that meet the condition if aLimit is negative
+ *  Load messages with specified keyword, returning messages are sorted by receiving timestamp. If reference timestamp is negative, load from the latest messages; if message count is negative, load all messages that meet the condition.
  *
- *  @param aKeywords    Search content, will ignore it if it's empty
- *  @param aTimestamp   Reference timestamp
- *  @param aLimit       Count of messages to load
- *  @param aSender      Message sender, will ignore it if it's empty
-*  @param aDirection    Message search direction
+ *  @param aKeywords        Search content, will ignore it if it's empty
+ *  @param aTimestamp       Reference timestamp
+ *  @param aCount           Count of messages to load
+ *  @param aSender          Message sender (optional)
+ *  @param aDirection       Message search direction
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Message list<EMMessage>
  */
-- (NSArray *)loadMoreMessagesContain:(NSString*)aKeywords
-                               before:(long long)aTimestamp
-                                limit:(int)aLimit
-                                 from:(NSString*)aSender
-                            direction:(EMMessageSearchDirection)aDirection;
+- (void)loadMessagesWithKeyword:(NSString*)aKeyword
+                      timestamp:(long long)aTimestamp
+                          count:(int)aCount
+                       fromUser:(NSString*)aSender
+                searchDirection:(EMMessageSearchDirection)aDirection
+                     completion:(void (^)(NSArray *aMessages, EMError *aError))aCompletionBlock;
 
 /*!
- *  Load messages from DB in duration, result messages are sorted by receive time, user should limit the max count to load to avoid memory issue
+ *  Load messages within specified time range, retruning messages are sorted by receiving timestamp
  *
  *  @param aStartTimestamp  Start time's timestamp in miliseconds
  *  @param aEndTimestamp    End time's timestamp in miliseconds
- *  @param aMaxCount        Message search direction
- *
- *  @result Message list<EMMessage>
- */
-- (NSArray *)loadMoreMessagesFrom:(long long)aStartTimestamp
-                               to:(long long)aEndTimestamp
-                         maxCount:(int)aMaxCount;
-
-/*!
- *  Get latest message that received from others
+ *  @param aCount           Message search direction
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Message instance
  */
-- (EMMessage *)latestMessageFromOthers;
-
+- (void)loadMessagesFrom:(long long)aStartTimestamp
+                      to:(long long)aEndTimestamp
+                   count:(int)aCount
+              completion:(void (^)(NSArray *aMessages, EMError *aError))aCompletionBlock;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMCursorResult.h b/HyphenateSDK/HyphenateFull-SDK/include/EMCursorResult.h
index 6ff7bce..9d5ac4e 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMCursorResult.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMCursorResult.h
@@ -28,7 +28,7 @@
  *  @param aList    Result list<id>
  *  @param aCusror  The cursor of next section
  *
- *  @result Instance of cursor result
+ *  @result An instance of cursor result
  */
 + (instancetype)cursorResultWithList:(NSArray *)aList
                            andCursor:(NSString *)aCusror;
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMError.h b/HyphenateSDK/HyphenateFull-SDK/include/EMError.h
index bd99f27..67207c0 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMError.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMError.h
@@ -22,11 +22,11 @@
 /*!
  *  Error description
  */
-@property (nonatomic, strong) NSString *errorDescription;
+@property (nonatomic, copy) NSString *errorDescription;
 
 
 /*!
- *  Initialize a error instance
+ *  Initialize an error instance
  *
  *  @param aDescription  Error description
  *  @param aCode         Error code
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMErrorCode.h b/HyphenateSDK/HyphenateFull-SDK/include/EMErrorCode.h
index abf14e8..95f6564 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMErrorCode.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMErrorCode.h
@@ -7,58 +7,60 @@
 
 typedef enum{
 
-    EMErrorGeneral = 1,                      /*! General error */
-    EMErrorNetworkUnavailable,               /*! Network is unavaliable */
+    EMErrorGeneral = 1,                      /*!  General error */
+    EMErrorNetworkUnavailable,               /*!  Network is unavaliable */
+    EMErrorDatabaseOperationFailed,          /*!  Database operation failed */
     
-    EMErrorInvalidAppkey = 100,              /*! App key is invalid */
-    EMErrorInvalidUsername,                  /*! User name is invalid */
-    EMErrorInvalidPassword,                  /*! Password is invalid */
-    EMErrorInvalidURL,                       /*! URL is invalid */
+    EMErrorInvalidAppkey = 100,              /*!  App key is invalid */
+    EMErrorInvalidUsername,                  /*!  User name is invalid */
+    EMErrorInvalidPassword,                  /*!  Password is invalid */
+    EMErrorInvalidURL,                       /*!  URL is invalid */
     
-    EMErrorUserAlreadyLogin = 200,           /*! User has already logged in */
-    EMErrorUserNotLogin,                     /*! User has not logged in */
-    EMErrorUserAuthenticationFailed,         /*! Password check failed */
-    EMErrorUserAlreadyExist,                 /*! User has already exist */
-    EMErrorUserNotFound,                     /*! User was not found */
-    EMErrorUserIllegalArgument,              /*! Illegal argument */
-    EMErrorUserLoginOnAnotherDevice,         /*! User has logged in from another device */
-    EMErrorUserRemoved,                      /*! User was removed from server */
-    EMErrorUserRegisterFailed,               /*! Register user failed */
-    EMErrorUpdateApnsConfigsFailed,          /*! Update apns configs failed */
-    EMErrorUserPermissionDenied,             /*! User has no right for this operation. */
+    EMErrorUserAlreadyLogin = 200,           /*!  User has already logged in */
+    EMErrorUserNotLogin,                     /*!  User has not logged in */
+    EMErrorUserAuthenticationFailed,         /*!  Password authentication failed */
+    EMErrorUserAlreadyExist,                 /*!  User has already existed */
+    EMErrorUserNotFound,                     /*!  User was not found */
+    EMErrorUserIllegalArgument,              /*!  Illegal argument */
+    EMErrorUserLoginOnAnotherDevice,         /*!  User has logged in from another device */
+    EMErrorUserRemoved,                      /*!  User was removed from server */
+    EMErrorUserRegisterFailed,               /*!  Registration failed */
+    EMErrorUpdateApnsConfigsFailed,          /*!  Update Apple Push Notification configurations failed */
+    EMErrorUserPermissionDenied,             /*!  User has no access for this operation. */
     
-    EMErrorServerNotReachable = 300,         /*! Server is not reachable */
-    EMErrorServerTimeout,                    /*! Wait server response timeout */
-    EMErrorServerBusy,                       /*! Server is busy */
-    EMErrorServerUnknownError,               /*! Unknown server error */
+    EMErrorServerNotReachable = 300,         /*!  Server is not reachable */
+    EMErrorServerTimeout,                    /*!  Server response timeout */
+    EMErrorServerBusy,                       /*!  Server is busy */
+    EMErrorServerUnknownError,               /*!  Unknown server error */
+    EMErrorServerGetDNSConfigFailed,         /*!  Get DNS config failure */
     
-    EMErrorFileNotFound = 400,               /*! Can't find the file */
-    EMErrorFileInvalid,                      /*! File is invalid */
-    EMErrorFileUploadFailed,                 /*! Upload file failed */
-    EMErrorFileDownloadFailed,               /*! Download file failed */
+    EMErrorFileNotFound = 400,               /*!  Can't find the file */
+    EMErrorFileInvalid,                      /*!  File is invalid */
+    EMErrorFileUploadFailed,                 /*!  Upload file failure */
+    EMErrorFileDownloadFailed,               /*!  Download file failed */
     
-    EMErrorMessageInvalid = 500,             /*! Message is invalid */
-    EMErrorMessageIncludeIllegalContent,     /*! Message contains illegal content */
-    EMErrorMessageTrafficLimit,              /*! Unit time to send messages over the upper limit */
-    EMErrorMessageEncryption,                /*! Encryption error */
+    EMErrorMessageInvalid = 500,             /*!  Message is invalid */
+    EMErrorMessageIncludeIllegalContent,      /*!  Message contains illegal content */
+    EMErrorMessageTrafficLimit,              /*!  Unit time to send messages over the upper limit */
+    EMErrorMessageEncryption,                /*!  Encryption error */
     
-    EMErrorGroupInvalidId = 600,             /*! Group Id is invalid */
-    EMErrorGroupAlreadyJoined,               /*! User has already joined the group */
-    EMErrorGroupNotJoined,                   /*! User has not joined the group */
-    EMErrorGroupPermissionDenied,            /*! User has NO authority for the operation */
-    EMErrorGroupMembersFull,                 /*! Reach group's max member count */
-    EMErrorGroupNotExist,                    /*! Group is not exist */
+    EMErrorGroupInvalidId = 600,             /*!  Group Id is invalid */
+    EMErrorGroupAlreadyJoined,               /*!  User has already joined the group */
+    EMErrorGroupNotJoined,                   /*!  User has not joined the group */
+    EMErrorGroupPermissionDenied,            /*!  User has no access for the operation */
+    EMErrorGroupMembersFull,                 /*!  Reach group's max member count */
+    EMErrorGroupNotExist,                    /*!  Group is not existed */
     
-    EMErrorChatroomInvalidId = 700,          /*! Chatroom id is invalid */
-    EMErrorChatroomAlreadyJoined,            /*! User has already joined the chatroom */
-    EMErrorChatroomNotJoined,                /*! User has not joined the chatroom */
-    EMErrorChatroomPermissionDenied,         /*! User has NO authority for the operation */
-    EMErrorChatroomMembersFull,              /*! Reach chatroom's max member count */
-    EMErrorChatroomNotExist,                 /*! Chatroom is not exist */
+    EMErrorChatroomInvalidId = 700,          /*!  Chatroom id is invalid */
+    EMErrorChatroomAlreadyJoined,            /*!  User has already joined the chatroom */
+    EMErrorChatroomNotJoined,                /*!  User has not joined the chatroom */
+    EMErrorChatroomPermissionDenied,         /*!  User has no access for the operation */
+    EMErrorChatroomMembersFull,              /*!  Reach chatroom's capacity */
+    EMErrorChatroomNotExist,                 /*!  Chatroom is not existed */
     
-    EMErrorCallInvalidId = 800,              /*! Call id is invalid */
-    EMErrorCallBusy,                         /*! User is busy */
-    EMErrorCallRemoteOffline,                /*! Callee is offline */
-    EMErrorCallConnectFailed,                /*! Establish connection failed */
+    EMErrorCallInvalidId = 800,              /*!  Call id is invalid */
+    EMErrorCallBusy,                         /*!  User is busy */
+    EMErrorCallRemoteOffline,                /*!  Callee is offline */
+    EMErrorCallConnectFailed,                /*!  Establish connection failure */
 
 }EMErrorCode;
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMFileMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMFileMessageBody.h
index 3ad3e45..9bea59b 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMFileMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMFileMessageBody.h
@@ -10,13 +10,13 @@
 #import "EMMessageBody.h"
 
 /*!
- *  Download status of attachment
+ *  Message attachment download status
  */
 typedef enum{
-    EMDownloadStatusDownloading   = 0,  /*! Downloading */
-    EMDownloadStatusSuccessed,          /*! Successed */
-    EMDownloadStatusFailed,             /*! Failed */
-    EMDownloadStatusPending,            /*! Pending */
+    EMDownloadStatusDownloading   = 0,  /*!  Downloading */
+    EMDownloadStatusSuccessed,          /*!  Successed */
+    EMDownloadStatusFailed,             /*!  Failed */
+    EMDownloadStatusPending,            /*!  Pending */
 }EMDownloadStatus;
 
 /*!
@@ -40,7 +40,7 @@ typedef enum{
 @property (nonatomic, copy) NSString *remotePath;
 
 /*!
- *  Secret key of attachment, need verify secret key when download attachment
+ *  Secret key for downloading the message attachment
  */
 @property (nonatomic, copy) NSString *secretKey;
 
@@ -58,7 +58,7 @@ typedef enum{
  *   Initialize a file message body instance
  *
  *  @param aLocalPath   Local path of the attachment
- *  @param aDisplayName Display name of the attachment (NOT include file path)
+ *  @param aDisplayName Display name of the attachment
  *
  *  @result File message body instance
  */
@@ -69,7 +69,7 @@ typedef enum{
  *  Initialize a file message body instance
  *
  *  @param aData        The data of attachment file
- *  @param aDisplayName Display name of the attachment (NOT include file path)
+ *  @param aDisplayName Display name of the attachment
  *
  *  @result File message body instance
  */
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMGroup.h b/HyphenateSDK/HyphenateFull-SDK/include/EMGroup.h
index 74b5756..999df03 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMGroup.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMGroup.h
@@ -20,66 +20,68 @@
 @property (nonatomic, copy, readonly) NSString *groupId;
 
 /*!
- *  Group's subject, need to fetch group's specification
+ *  Subject of the group
  */
 @property (nonatomic, copy, readonly) NSString *subject;
 
 /*!
- *  Group's description, need to fetch group's specification
+ *  Description of the group
  */
 @property (nonatomic, copy, readonly) NSString *description;
 
 /*!
- *  The number of members, need to fetch group's specification
+ *  The total number of group members
  */
-@property (nonatomic, readonly) NSInteger occupantsCount;
+@property (nonatomic, readonly) NSInteger occupantsCount __deprecated_msg("Use - membersCount");
+@property (nonatomic, readonly) NSInteger membersCount;
 
 /*!
- *  Group's setting options, need to fetch group's specification
+ *  Setting options of group
  */
 @property (nonatomic, strong, readonly) EMGroupOptions *setting;
 
 /*!
- *  Group‘s owner, has the highest authority, need to fetch group's specification
+ *  Owner of the group
  *
- *  A group only has one owner
+ *  Each group only has one owner
  */
 @property (nonatomic, copy, readonly) NSString *owner;
 
 /*!
- *  Member list of group, need to fetch group's specification
+ *  Member list of the group
  */
 @property (nonatomic, copy, readonly) NSArray *members;
 
 /*!
- *  Group‘s blacklist, need to call fetching group's blacklist method first
+ *  Group‘s blacklist of blocked users
  *
- *  Need owner's authority, will return nil if user is not the owner of the group
+ *  Need owner's authority to access, return nil if user is not the group owner.
  */
-@property (nonatomic, strong, readonly) NSArray *bans;
+@property (nonatomic, strong, readonly) NSArray *bans __deprecated_msg("Use - blackList");
+@property (nonatomic, strong, readonly) NSArray *blackList;
 
 /*!
- *  All occupants of the group, include both the owner and all members
+ *  All occupants of the group, includes the group owner and all other group members
  */
 @property (nonatomic, strong, readonly) NSArray *occupants;
 
 /*!
- *  Whether this group receive push notifications
+ *  Is Apple Push Notification Service enabled for group
  */
 @property (nonatomic, readonly) BOOL isPushNotificationEnabled;
 
 /*!
- *  Whether is public group, need to fetch group's specification
+ *  Whether is a public group
  */
 @property (nonatomic, readonly) BOOL isPublic;
 
 /*!
- *  Whether block this group‘s message
+ *  Whether block the current group‘s messages
  */
 @property (nonatomic, readonly) BOOL isBlocked;
 
 /*!
- *  Initialize group instance
+ *  Initialize a group instance
  *
  *  Please use [+groupWithId:]
  *
@@ -88,9 +90,9 @@
 - (instancetype)init __deprecated_msg("Use +groupWithId:");
 
 /*!
- *  Get group instance, create a instance if do not exist
+ *  Get group instance, create a instance if it does not exist
  *
- *  @param aGroupId    Group id
+ *  @param aGroupId  Group id
  *
  *  @result Group instance
  */
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMGroupManagerDelegate.h b/HyphenateSDK/HyphenateFull-SDK/include/EMGroupManagerDelegate.h
index d375f9c..7d69fc4 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMGroupManagerDelegate.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMGroupManagerDelegate.h
@@ -8,106 +8,118 @@
 #import <Foundation/Foundation.h>
 
 /*!
- *  The reason of leaved the group
+ *  The reason of user leaving the group
  */
 typedef enum{
-    EMGroupLeaveReasonBeRemoved = 0,    /*! Removed by owner */
-    EMGroupLeaveReasonUserLeave,        /*! Self leave */
-    EMGroupLeaveReasonDestroyed,        /*! Group has been destroyed */
+    EMGroupLeaveReasonBeRemoved = 0,    /*!  Removed by owner */
+    EMGroupLeaveReasonUserLeave,        /*!  User leave the group */
+    EMGroupLeaveReasonDestroyed,        /*!  Group has been destroyed */
 }EMGroupLeaveReason;
 
 @class EMGroup;
 
 /*!
- *  Callbacks of group
+ *  Delegate
  */
 @protocol EMGroupManagerDelegate <NSObject>
 
 @optional
 
 /*!
+ *  Delegate method will be invoked when receiving a group invitation
+ *
  *  After user A invites user B into the group, user B will receive this callback
  *
  *  @param aGroupId    The group ID
  *  @param aInviter    Inviter
- *  @param aMessage    Invite message
+ *  @param aMessage    Invitation message
  */
-- (void)didReceiveGroupInvitation:(NSString *)aGroupId
+- (void)groupInvitationDidReceive:(NSString *)aGroupId
                           inviter:(NSString *)aInviter
                           message:(NSString *)aMessage;
 
 /*!
+ *  Delegate method will be invoked when the group invitation is accepted
+ *
  *  After user B accepted user A‘s group invitation, user A will receive this callback
  *
  *  @param aGroup    User joined group
  *  @param aInvitee  Invitee
  */
-- (void)didReceiveAcceptedGroupInvitation:(EMGroup *)aGroup
-                                  invitee:(NSString *)aInvitee;
+- (void)groupInvitationDidAccept:(EMGroup *)aGroup
+                         invitee:(NSString *)aInvitee;
 
 /*!
+ *  Delegate method will be invoked when the group invitation is decliend.
+ *
  *  After user B declined user A's group invitation, user A will receive the callback
  *
  *  @param aGroup    Group instance
  *  @param aInvitee  Invitee
  *  @param aReason   Decline reason
  */
-- (void)didReceiveDeclinedGroupInvitation:(EMGroup *)aGroup
-                                  invitee:(NSString *)aInvitee
-                                   reason:(NSString *)aReason;
+- (void)groupInvitationDidDecline:(EMGroup *)aGroup
+                          invitee:(NSString *)aInvitee
+                           reason:(NSString *)aReason;
 
 /*!
+ *  Delegate method will be invoked after SDK automatically accepted the group invitation
+ *
  *  User B will receive this callback after SDK automatically accept user A's group invitation, need set EMOptions's isAutoAcceptGroupInvitation property to YES
  *
- *  @param aGroup    Group
+ *  @param aGroup    Group instance
  *  @param aInviter  Inviter
  *  @param aMessage  Invite message
  */
-- (void)didJoinedGroup:(EMGroup *)aGroup
-               inviter:(NSString *)aInviter
-               message:(NSString *)aMessage;
+- (void)didJoinGroup:(EMGroup *)aGroup
+             inviter:(NSString *)aInviter
+             message:(NSString *)aMessage;
 
 /*!
- *  Callback of leave group
+ *  Delegate method will be invoked when user leaves a group
  *
  *  @param aGroup    Group instance
  *  @param aReason   Leave reason
  */
-- (void)didReceiveLeavedGroup:(EMGroup *)aGroup
-                       reason:(EMGroupLeaveReason)aReason;
+- (void)didLeaveGroup:(EMGroup *)aGroup
+               reason:(EMGroupLeaveReason)aReason;
 
 /*!
- *  Group's owner receive user's applicaton of joining group, group's style is EMGroupStylePublicJoinNeedApproval
+ *  Delegate method will be invoked when the group owner receives a group request and group's style is EMGroupStylePublicJoinNeedApproval
  *
- *  @param aGroup     Group
- *  @param aApplicant The applicant
- *  @param aReason    The applicant's message
+ *  @param aGroup     Group instance
+ *  @param aUsername  The user initialized the group join request
+ *  @param aReason    The user's message
  */
-- (void)didReceiveJoinGroupApplication:(EMGroup *)aGroup
-                             applicant:(NSString *)aApplicant
-                                reason:(NSString *)aReason;
+- (void)joinGroupRequestDidReceive:(EMGroup *)aGroup
+                              user:(NSString *)aUsername
+                            reason:(NSString *)aReason;
 
 /*!
- *  User A will receive this callback after group's owner declined it's application, group's style is EMGroupStylePublicJoinNeedApproval
+ *  Delegate method will be invoked when the group owner declines a join group request
+ *
+ *  User A will receive this callback after group's owner declined the group request, group's style is EMGroupStylePublicJoinNeedApproval
  *
  *  @param aGroupId    Group id
  *  @param aReason     Decline reason
  */
-- (void)didReceiveDeclinedJoinGroup:(NSString *)aGroupId
-                             reason:(NSString *)aReason;
+- (void)joinGroupRequestDidDecline:(NSString *)aGroupId
+                            reason:(NSString *)aReason;
 
 /*!
- *  User A will receive this callback after group's owner accepted it's application, group's style is EMGroupStylePublicJoinNeedApproval
+ *  Delegate method will be invoked when the group owner approves a join group request
+ *
+ *  User A will receive this callback after group's owner approve the group request, group's style is EMGroupStylePublicJoinNeedApproval
  *
  *  @param aGroup   Group instance
  */
-- (void)didReceiveAcceptedJoinGroup:(EMGroup *)aGroup;
+- (void)joinGroupRequestDidApprove:(EMGroup *)aGroup;
 
 /*!
- *  Group List changed
+ *  Group List updated
  *
  *  @param aGroupList  Group list<EMGroup>
  */
-- (void)didUpdateGroupList:(NSArray *)aGroupList;
+- (void)groupListDidUpdate:(NSArray *)aGroupList;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMGroupOptions.h b/HyphenateSDK/HyphenateFull-SDK/include/EMGroupOptions.h
index 084026f..10e5858 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMGroupOptions.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMGroupOptions.h
@@ -14,10 +14,10 @@
  *  Group style
  */
 typedef enum{
-    EMGroupStylePrivateOnlyOwnerInvite  = 0,    /*! Private groups, only owner can invite users to join */
-    EMGroupStylePrivateMemberCanInvite,         /*! Private groups, both owner and members can invite users to join  */
-    EMGroupStylePublicJoinNeedApproval,         /*! Public groups, owner can invite users to join; User can join group after owner accept user's application */
-    EMGroupStylePublicOpenJoin,                 /*! Public groups, user can join the group freely */
+    EMGroupStylePrivateOnlyOwnerInvite  = 0,    /*!  Private groups, only owner can invite users to join */
+    EMGroupStylePrivateMemberCanInvite,         /*!  Private groups, both owner and members can invite users to join  */
+    EMGroupStylePublicJoinNeedApproval,         /*!  Public groups, owner can invite users to join; User can join group after owner approves user's group request */
+    EMGroupStylePublicOpenJoin,                 /*!  Public groups, user can join the group freely */
 }EMGroupStyle;
 
 /*!
@@ -31,7 +31,7 @@ typedef enum{
 @property (nonatomic) EMGroupStyle style;
 
 /*!
- *  The maximum number of group member(3-2000, the default is 200)
+ *  The group capacity (3-2000, the default is 200)
  */
 @property (nonatomic) NSInteger maxUsersCount;
 
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMImageMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMImageMessageBody.h
index c0968b0..51be839 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMImageMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMImageMessageBody.h
@@ -10,8 +10,7 @@
 #import "EMFileMessageBody.h"
 
 /*!
- *  Image message body, SDK will compress the image of message body that created by -(instancetype)initWithData:displayName: or
- *  -(instancetype)initWithData:thumbnailData before send the message
+ *  Image message body
  */
 @interface EMImageMessageBody : EMFileMessageBody
 
@@ -21,10 +20,11 @@
 @property (nonatomic) CGSize size;
 
 /*!
- *  Set compress ratio of image message, 1.0 without compress, default value is 0.6, 
-    will use the default value if try to set a value that equal to or less than 0
+ *  Image compression ratio. 1.0 without compression, default value is 0.6. SDK uses the default value if the given value is less than zero.
  */
-@property (nonatomic) CGFloat compressRatio;
+@property (nonatomic) CGFloat compressRatio __deprecated_msg("Use - compressionRatio");
+
+@property (nonatomic) CGFloat compressionRatio;
 
 /*!
  *  Display name of thumbnail
@@ -42,32 +42,32 @@
 @property (nonatomic, copy) NSString *thumbnailRemotePath;
 
 /*!
- *  Secret key of thumbnail, need verify secret key when download thumbnail
+ *  Secret key for downloading a thumbnail image
  */
 @property (nonatomic, copy) NSString *thumbnailSecretKey;
 
 /*!
- *  Size of thumbnail
+ *  Size of a thumbnail
  */
 @property (nonatomic) CGSize thumbnailSize;
 
 /*!
- *  File length of thumbnail, in bytes
+ *  File length of a thumbnail, in bytes
  */
 @property (nonatomic) long long thumbnailFileLength;
 
 /*!
- *  Download status of thumbnail
+ *  Download status of a thumbnail
  */
 @property (nonatomic)EMDownloadStatus thumbnailDownloadStatus;
 
 /*!
- *  Initialize image message body instance
+ *  Initialize an image message body instance
  *
  *  @param aData          The data of image
  *  @param aThumbnailData The data of thumbnail
  *
- *  @result Image message body instance
+ *  @result An image message body instance
  */
 - (instancetype)initWithData:(NSData *)aData
                thumbnailData:(NSData *)aThumbnailData;
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMLocationMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMLocationMessageBody.h
index 5fc4ea8..eaefeed 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMLocationMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMLocationMessageBody.h
@@ -15,12 +15,12 @@
 @interface EMLocationMessageBody : EMMessageBody
 
 /*!
- *  Latitude
+ *  Location latitude
  */
 @property (nonatomic) double latitude;
 
 /*!
- *  Longitude
+ *  Loctaion longitude
  */
 @property (nonatomic) double longitude;
 
@@ -30,7 +30,7 @@
 @property (nonatomic, copy) NSString *address;
 
 /*!
- *  Initialize location message body instance
+ *  Initialize a location message body instance
  *
  *  @param aLatitude   Latitude
  *  @param aLongitude  Longitude
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMMessage.h b/HyphenateSDK/HyphenateFull-SDK/include/EMMessage.h
index 10c4bf5..33a8160 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMMessage.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMMessage.h
@@ -13,27 +13,27 @@
  *  Chat type
  */
 typedef enum{
-    EMChatTypeChat   = 0,   /*! Chat */
-    EMChatTypeGroupChat,    /*! Group chat */
-    EMChatTypeChatRoom,     /*! Chatroom chat */
+    EMChatTypeChat   = 0,   /*!  one to one chat type */
+    EMChatTypeGroupChat,    /*!  Group chat type */
+    EMChatTypeChatRoom,     /*!  Chatroom chat type */
 }EMChatType;
 
 /*!
  *   Message Status
  */
 typedef enum{
-    EMMessageStatusPending  = 0,    /*! Pending */
-    EMMessageStatusDelivering,      /*! Delivering */
-    EMMessageStatusSuccessed,       /*! Successed */
-    EMMessageStatusFailed,          /*! Failed */
+    EMMessageStatusPending  = 0,    /*!  Pending */
+    EMMessageStatusDelivering,      /*!  Delivering */
+    EMMessageStatusSuccessed,       /*!  Successed */
+    EMMessageStatusFailed,          /*!  Failed */
 }EMMessageStatus;
 
 /*!
  *  Message direction
  */
 typedef enum{
-    EMMessageDirectionSend = 0,    /*! Send */
-    EMMessageDirectionReceive,     /*! Receive */
+    EMMessageDirectionSend = 0,    /*!  Send */
+    EMMessageDirectionReceive,     /*!  Receive */
 }EMMessageDirection;
 
 /*!
@@ -57,12 +57,12 @@ typedef enum{
 @property (nonatomic) EMMessageDirection direction;
 
 /*!
- *  The sender
+ *  Message sender
  */
 @property (nonatomic, copy) NSString *from;
 
 /*!
- *  The receiver
+ *  Message receiver
  */
 @property (nonatomic, copy) NSString *to;
 
@@ -72,7 +72,7 @@ typedef enum{
 @property (nonatomic) long long timestamp;
 
 /*!
- *  The time of client send/received this message
+ *  The time of client send/receive the message
  */
 @property (nonatomic) long long localTime;
 
@@ -87,12 +87,12 @@ typedef enum{
 @property (nonatomic) EMMessageStatus status;
 
 /*!
- *  Whether read ack has been sent or received, it indicates whether has received read ack for sender, and whether has send read ack for receiver
+ *  Whether read acknowledgement has been sent or received, it indicates whether the sender has received a message read acknowledgement, or whether the recipient has sent a message read acknowledgement
  */
 @property (nonatomic) BOOL isReadAcked;
 
 /*!
- *  Whether delivery ack has been sent or received, it indicates whether has received delivery ack for send, and whether has send delivery ack for receiver, SDK will automatically send delivery ack if EMOptions has set enableDeliveryAck
+ *  Whether delivery acknowledgement has been sent or received, it indicates whether the sender has received a message deliver acknowledgement, or whether the recipient has sent a message deliver acknowledgement, SDK will automatically send delivery acknowledgement if EMOptions is set to enableDeliveryAck
  */
 @property (nonatomic) BOOL isDeliverAcked;
 
@@ -109,12 +109,12 @@ typedef enum{
 /*!
  *  Message extention
  *
- *  Key type must be NSString, Value type must be NSString or NSNumber of BOOL, int, unsigned in, long long, double.
+ *  Key type must be NSString, Value type must be NSString, int, unsigned in, long long, or double. Please use NSNumber (@YES or @NO) instead of BOOL.
  */
 @property (nonatomic, copy) NSDictionary *ext;
 
 /*!
- *  Initialize message instance
+ *  Initialize a message instance
  *
  *  @param aConversationId  Conversation id
  *  @param aFrom            The sender
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMMessageBody.h
index 2f705bc..d06a1d4 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMMessageBody.h
@@ -12,13 +12,13 @@
  *  Message body type
  */
 typedef enum{
-    EMMessageBodyTypeText   = 1,    /*! Text */
-    EMMessageBodyTypeImage,         /*! Image */
-    EMMessageBodyTypeVideo,         /*! Video */
-    EMMessageBodyTypeLocation,      /*! Location */
-    EMMessageBodyTypeVoice,         /*! Voice */
-    EMMessageBodyTypeFile,          /*! File */
-    EMMessageBodyTypeCmd,           /*! Cmd */
+    EMMessageBodyTypeText   = 1,    /*!  Text */
+    EMMessageBodyTypeImage,         /*!  Image */
+    EMMessageBodyTypeVideo,         /*!  Video */
+    EMMessageBodyTypeLocation,      /*!  Location */
+    EMMessageBodyTypeVoice,         /*!  Voice */
+    EMMessageBodyTypeFile,          /*!  File */
+    EMMessageBodyTypeCmd,           /*!  Command */
 }EMMessageBodyType;
 
 /*!
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMOptions+PrivateDeploy.h b/HyphenateSDK/HyphenateFull-SDK/include/EMOptions+PrivateDeploy.h
index 0da9246..bb1fae6 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMOptions+PrivateDeploy.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMOptions+PrivateDeploy.h
@@ -1,6 +1,6 @@
 /*!	
  *  @header   EMOptions+PrivateDeploy.h
- *  @abstract SDK setting options of private  deployment
+ *  @abstract SDK setting options of private deployment
  *  @author   Hyphenate
  *  @version  3.0
  */
@@ -10,31 +10,32 @@
 @interface EMOptions (PrivateDeploy)
 
 /*!
- *  Whether allow to use DNS, default is YES
+ *  Whether to allow using DNS, default is YES
  *
- *  Can only set when initialize SDK [EMClient initializeSDKWithOptions:], can't change it in runtime
+ *  Can only be set when initializing the SDK [EMClient initializeSDKWithOptions:], cannot be altered in runtime
  */
 @property (nonatomic, assign) BOOL enableDnsConfig;
 
 /*!
  *  IM server port
  *
- *  It's effective only when enableDnsConfig is NO. Can only set when initialize SDK [EMClient initializeSDKWithOptions:], can't change it in runtime
+ *  chatPort is Only effective when isDNSEnabled is NO. 
+ *  Can only be set when initializing the SDK with [EMClient initializeSDKWithOptions:], cannot be altered in runtime
  */
 @property (nonatomic, assign) int chatPort;
 
 /*!
  *  IM server
  *
- *  It's effective only when enableDnsConfig is NO. Can only set when initialize SDK [EMClient initializeSDKWithOptions:], can't change it in runtime
+ *  chatServer is Only effective when isDNSEnabled is NO. Can only be set when initializing the SDK with [EMClient initializeSDKWithOptions:], cannot be altered in runtime
  */
-@property (nonatomic, strong) NSString *chatServer;
+@property (nonatomic, copy) NSString *chatServer;
 
 /*!
  *  REST server
  *
- *  It's effective only when enableDnsConfig is NO. Can only set when initialize SDK [EMClient initializeSDKWithOptions:], can't change it in runtime
+ *  restServer Only effective when isDNSEnabled is NO. Can only be set when initializing the SDK with [EMClient initializeSDKWithOptions:], cannot be altered in runtime
  */
-@property (nonatomic, strong) NSString *restServer;
+@property (nonatomic, copy) NSString *restServer;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMOptions.h b/HyphenateSDK/HyphenateFull-SDK/include/EMOptions.h
index 7016306..b64178b 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMOptions.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMOptions.h
@@ -11,9 +11,9 @@
  *  Log output level
  */
 typedef enum {
-    EMLogLevelDebug = 0, /*! Output all log */
-    EMLogLevelWarning,   /*! Output warning and error */
-    EMLogLevelError      /*! Output error only */
+    EMLogLevelDebug = 0, /*!  Output all logs */
+    EMLogLevelWarning,   /*!  Output warnings and errors */
+    EMLogLevelError      /*!  Output errors only */
 } EMLogLevel;
 
 /*!
@@ -24,7 +24,7 @@ typedef enum {
 /*!
  *  Application's unique identifier
  */
-@property (nonatomic, strong, readonly) NSString *appkey;
+@property (nonatomic, copy, readonly) NSString *appkey;
 
 /*!
  *  Whether print log to console, default is NO
@@ -44,61 +44,61 @@ typedef enum {
 /*!
  *  Whether using development environment, default is NO
  *
- *  Can only set when initialize sdk [EMClient initializeSDKWithOptions:], can't change it in runtime
+ *  Can only be set when initializing the sdk with [EMClient initializeSDKWithOptions:], can't be altered in runtime.
  */
 @property (nonatomic, assign) BOOL isSandboxMode;
 
 /*!
  *  Whether auto login, default is YES
  *
- *  Value will be saved to the local. When initialization EMOptions, the first to get the value of the local saved
+ *  Value is saved locally. When initializing the EMOptions, SDK looks for the local value first.
  */
 @property (nonatomic, assign) BOOL isAutoLogin;
 
 /*!
- *  Whether delete all of the group's message when leave group, default is YES
+ *  Whether to delete all the group messages when leaving the group, default is YES
  */
 @property (nonatomic, assign) BOOL isDeleteMessagesWhenExitGroup;
 
 /*!
- *  Whether delete all of the chatroom's message when leave chatroom, default is YES
+ *  Whether to delete all the chat room messages when leaving the chat room, default is YES
  */
 @property (nonatomic, assign) BOOL isDeleteMessagesWhenExitChatRoom;
 
 /*!
- *  Whether chatroom's owner can leave chatroom, default is YES
+ *  Whether chat room's owner can leave the chat room, default is YES.
  */
 @property (nonatomic, assign) BOOL isChatroomOwnerLeaveAllowed;
 
 /*!
- *  Whether automatically accept group invitation, default is YES
+ *  Whether to automatically accept group invitation, default is YES
  */
 @property (nonatomic, assign) BOOL isAutoAcceptGroupInvitation;
 
 /*!
- *  Whether automatically accept friend invitation, default is NO
+ *  Whether to automatically approve friend request, default is NO
  */
 @property (nonatomic, assign) BOOL isAutoAcceptFriendInvitation;
 
 /*!
- *  Whether send delivery ack, default is NO, SDK will automatically send delivery ack when receive a single chat message if it's set to YES
+ *  Whether to send delivery acknowledgement, default is NO. If set to YES, SDK will automatically send a delivery acknowledgement when receiving a chat message
  */
 @property (nonatomic, assign) BOOL enableDeliveryAck;
 
 /*!
- *  Whether sort message by server time when load message from database, default is YES, sort by server time
+ *  Whether to sort messages by server received time when loading message from database, default is YES.
  */
 @property (nonatomic, assign) BOOL sortMessageByServerTime;
 
 /*!
- *  iOS only, push certificate name
+ *  Certificate name of Apple Push Notification Service
  *
- *  Can only set when initialize SDK [EMClient initializeSDKWithOptions:], can't change it in runtime
+ *  Can only be set when initializing the SDK with [EMClient initializeSDKWithOptions:], can't be altered in runtime.
  */
-@property (nonatomic, strong) NSString *apnsCertName;
+@property (nonatomic, copy) NSString *apnsCertName;
 
 /*!
- *  Get SDK setting options instance
+ *  Get a SDK setting options instance
  *
  *  @param aAppkey  App‘s unique identifier
  *
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMPushOptions.h b/HyphenateSDK/HyphenateFull-SDK/include/EMPushOptions.h
index 34aea8f..dd17480 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMPushOptions.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMPushOptions.h
@@ -1,6 +1,6 @@
 /*!
  *  @header EMPushOptions.h
- *  @abstract Setting options of Apple APNS
+ *  @abstract Setting options of Apple Push Notification
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -19,50 +19,51 @@
  *  Display style of push message
  */
 typedef enum{
-    EMPushDisplayStyleSimpleBanner = 0, /*!
+    EMPushDisplayStyleSimpleBanner = 0, /*! 
                                          *  Simply show "You have a new message"
                                          */
-    EMPushDisplayStyleMessageSummary,   /*!
+    EMPushDisplayStyleMessageSummary,   /*! 
                                          *  Show message's content
                                          */
 }EMPushDisplayStyle;
 
 /*!
- *  Status of APNS no-disturb setting
+ *  Status of Push Notification no-disturb setting
  */
 typedef enum{
-    EMPushNoDisturbStatusDay = 0,   /*! The whole day */
-    EMPushNoDisturbStatusCustom,    /*! User defined period */
-    EMPushNoDisturbStatusClose,     /*! Close no-disturb mode */
+    EMPushNoDisturbStatusDay = 0,   /*!  The whole day */
+    EMPushNoDisturbStatusCustom,    /*!  User defined period */
+    EMPushNoDisturbStatusClose,     /*!  Close no-disturb mode */
 }EMPushNoDisturbStatus;
 
 /*!
- *  Apple APNS setting options
+ *  Apple Push Notification setting options
  */
 @interface EMPushOptions : NSObject
 
 /*!
- *  Nick name to show for push message
+ *  User's nickname to be displayed in apple push notification service messages
  */
-@property (nonatomic, strong) NSString *nickname;
+@property (nonatomic, copy) NSString *nickname __deprecated_msg("Use - displayName");
+@property (nonatomic, copy) NSString *displayName;
 
 /*!
- *  Display style of push message
+ *  Display style of notification message
  */
 @property (nonatomic) EMPushDisplayStyle displayStyle;
 
 /*!
- *  No-disturb setting of push message
+ *  No disturbing setting of notification message
  */
 @property (nonatomic) EMPushNoDisturbStatus noDisturbStatus;
 
 /*!
- *  No-disturn mode start time, only supports hour
+ *  No disturbing mode start time (in hour)
  */
 @property (nonatomic) NSInteger noDisturbingStartH;
 
 /*!
- *  No-disturn mode end time, only supports hour
+ *  No disturbing mode end time (in hour)
  */
 @property (nonatomic) NSInteger noDisturbingEndH;
 
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMSDK.h b/HyphenateSDK/HyphenateFull-SDK/include/EMSDK.h
index f15ad28..5b9c464 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMSDK.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMSDK.h
@@ -15,8 +15,8 @@
 
 #else
 
-#import <Hyphenate-SDK/EMClient.h>
-#import <Hyphenate-SDK/EMClientDelegate.h>
+#import <HyphenateSDK/EMClient.h>
+#import <HyphenateSDK/EMClientDelegate.h>
 
 #endif
 
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMSDKFull.h b/HyphenateSDK/HyphenateFull-SDK/include/EMSDKFull.h
index c30c265..8c05a5c 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMSDKFull.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMSDKFull.h
@@ -18,11 +18,11 @@
 
 #else
 
-#import <HyphenateFull-SDK/EMClient.h>
-#import <HyphenateFull-SDK/EMClientDelegate.h>
-#import <HyphenateFull-SDK/EMClient+Call.h>
+#import <Hyphenate/EMClient.h>
+#import <Hyphenate/EMClientDelegate.h>
+#import <Hyphenate/EMClient+Call.h>
 
-#import <HyphenateFull-SDK/EMCallSession.h>
+#import <Hyphenate/EMCallSession.h>
 
 #endif
 
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMTextMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMTextMessageBody.h
index f83ec24..ab8c898 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMTextMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMTextMessageBody.h
@@ -20,7 +20,7 @@
 @property (nonatomic, copy, readonly) NSString *text;
 
 /*!
- *  Initialize text message body instance
+ *  Initialize a text message body instance
  *
  *  @param aText   Text content
  *
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/EMVideoMessageBody.h b/HyphenateSDK/HyphenateFull-SDK/include/EMVideoMessageBody.h
index 4298c8d..3d3a74f 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/EMVideoMessageBody.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/EMVideoMessageBody.h
@@ -30,7 +30,7 @@
 @property (nonatomic, copy) NSString *thumbnailRemotePath;
 
 /*!
- *  Secret key of thumbnail, need verify secret key when download thumbnail
+ *  Secret key of thumbnail, required to download a thumbnail
  */
 @property (nonatomic, copy) NSString *thumbnailSecretKey;
 
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/IEMCallManager.h b/HyphenateSDK/HyphenateFull-SDK/include/IEMCallManager.h
index 9658204..bb96b8e 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/IEMCallManager.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/IEMCallManager.h
@@ -1,6 +1,6 @@
 /*!
  *  @header IEMCallManager.h
- *  @abstract This protocol defined the operations of real time voice/video call
+ *  @abstract This protocol defines the operations of real time voice/video call
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -30,6 +30,14 @@
 - (void)addDelegate:(id<EMCallManagerDelegate>)aDelegate
       delegateQueue:(dispatch_queue_t)aQueue;
 
+/*!
+ *  Add delegate
+ *
+ *  @param aDelegate  Delegate
+ *
+ */
+- (void)addDelegate:(id<EMCallManagerDelegate>)aDelegate;
+
 /*!
  *  Remove delegate
  *
@@ -40,7 +48,7 @@
 #pragma mark - Answer and End
 
 /*!
- *  Receiver answer the call
+ *  Recipient answer the incoming call
  *
  *  @param  aSessionId Session Id
  *
@@ -60,88 +68,60 @@
 #pragma mark - voice
 
 /*!
- *  Start a voice call session
- *
- *  @param aUsername  The callee
- *  @param pError     Error
- *
- *  @result Session instance
- */
-- (EMCallSession *)makeVoiceCall:(NSString *)aUsername
-                           error:(EMError **)pError;
-
-/*!
- *  Get video package lost rate
+ *  Start a voice call
  *
- *  @param aSessionId   Session ID
- *  @param aIsSilence   Is Silence
+ *  @param aUsername        The callee
+ *  @param aCompletionBlock The callback of completion
  *
- *  @result             Error
  */
-- (EMError *)markCallSession:(NSString *)aSessionId
-                   isSilence:(BOOL)aIsSilence;
+- (void)startVoiceCall:(NSString *)aUsername
+            completion:(void (^)(EMCallSession *aCallSession, EMError *aError))aCompletionBlock;
 
 /*!
- *  Suspend voice data transmission
+ *  Pause voice streaming
  *
  *  @param aSessionId   Session ID
  */
-- (void)pauseVoiceTransfer:(NSString *)aSessionId;
+- (void)pauseVoiceWithSession:(NSString *)aSessionId error:(EMError**)pError;
 
 /*!
- *  Resume voice data transmission
+ *  Resume voice streaming
  *
  *  @param aSessionId   Session ID
  */
-- (void)resumeVoiceTransfer:(NSString *)aSessionId;
-
+- (void)resumeVoiceWithSession:(NSString *)aSessionId error:(EMError**)pError;
 
 #pragma mark - video
 
 /*!
- *  Start a video call session
- *
- *  @param aUsername  The callee
- *  @param pError     Error
- *
- *  @result Session instance
- */
-- (EMCallSession *)makeVideoCall:(NSString *)aUsername
-                           error:(EMError **)pError;
-
-/*!
- * Suspend video data transmission
+ *  Start a video call
  *
- *  @param aSessionId   Session ID
- */
-- (void)pauseVideoTransfer:(NSString *)aSessionId;
-
-/*!
- *  Resume video data transmission
+ *  @param aUsername        The callee
+ *  @param aSuccessBlock    The callback block of completion
  *
- *  @param aSessionId   Session ID
  */
-- (void)resumeVideoTransfer:(NSString *)aSessionId;
+- (void)startVideoCall:(NSString *)aUsername
+            completion:(void (^)(EMCallSession *aCallSession, EMError *aError))aCompletionBlock;
 
 /*!
- * Suspend voice and video data transmission
+ * Pause video streaming
  *
  *  @param aSessionId   Session ID
  */
-- (void)pauseVoiceAndVideoTransfer:(NSString *)aSessionId;
+- (void)pauseVideoWithSession:(NSString *)aSessionId error:(EMError**)pError;
 
 /*!
- *  Resume voice and video data transmission
+ *  Resume video streaming
  *
  *  @param aSessionId   Session ID
  */
-- (void)resumeVoiceAndVideoTransfer:(NSString *)aSessionId;
+- (void)resumeVideoWithSession:(NSString *)aSessionId error:(EMError**)pError;
 
 /*!
- *  open or close video adaptive,default is close
+ *  Enable video adaptive, default is disable
  *
- *  @param aFlag   YES is open,NO is close
+ *  @param isAdaptive   YES is enable, NO is disable
  */
-- (void)setVideoAdaptive:(BOOL)aFlag;
+- (void)enableAdaptiveBirateStreaming:(BOOL)isAdaptive;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/IEMChatManager.h b/HyphenateSDK/HyphenateFull-SDK/include/IEMChatManager.h
index 1589eca..31ede76 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/IEMChatManager.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/IEMChatManager.h
@@ -1,6 +1,6 @@
 /*!
  *  @header IEMChatManager.h
- *  @abstract This protocol defined the operations of chat
+ *  @abstract This protocol defines the operations of chat
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -39,6 +39,13 @@
 - (void)addDelegate:(id<EMChatManagerDelegate>)aDelegate
       delegateQueue:(dispatch_queue_t)aQueue;
 
+/*!
+ *  Add delegate
+ *
+ *  @param aDelegate  Delegate
+ */
+- (void)addDelegate:(id<EMChatManagerDelegate>)aDelegate;
+
 /*!
  *  Remove delegate
  *
@@ -49,21 +56,12 @@
 #pragma mark - Conversation
 
 /*!
- *  Get all conversations, will load conversations from DB if not exist in memory
+ *  Get all conversations, by loading conversations from DB if not exist in memory
  *
  *  @result Conversation list<EMConversation>
  */
 - (NSArray *)getAllConversations;
 
-/*!
- *  Load all conversations from DB, will update conversation list in memory after this method is called
- *
- *  Synchronization method will block the current thread
- *
- *  @result Conversation list<EMConversation>
- */
-- (NSArray *)loadAllConversationsFromDB;
-
 /*!
  *  Get a conversation
  *
@@ -80,38 +78,41 @@
 /*!
  *  Delete a conversation
  *
- *  @param aConversationId  Conversation id
- *  @param aDeleteMessage   Whether delete messages
+ *  @param aConversationId      Conversation id
+ *  @param isDeleteMessages     Whether delete messages
+ *  @param aCompletionBlock     The callback block of completion
  *
- *  @result Whether deleted successfully
  */
-- (BOOL)deleteConversation:(NSString *)aConversationId
-            deleteMessages:(BOOL)aDeleteMessage;
+- (void)deleteConversation:(NSString *)aConversationId
+          isDeleteMessages:(BOOL)aIsDeleteMessages
+                completion:(void (^)(NSString *aConversationId, EMError *aError))aCompletionBlock;
 
 /*!
  *  Delete multiple conversations
  *
- *  @param aConversations  Conversation list<EMConversation>
- *  @param aDeleteMessage  Whether delete messages
+ *  @param aConversations       Conversation list<EMConversation>
+ *  @param aIsDeleteMessages    Whether delete messages
+ *  @param aCompletionBlock     The callback block of completion
  *
- *  @result Whether deleted successfully
  */
-- (BOOL)deleteConversations:(NSArray *)aConversations
-             deleteMessages:(BOOL)aDeleteMessage;
+- (void)deleteConversations:(NSArray *)aConversations
+           isDeleteMessages:(BOOL)aIsDeleteMessages
+                 completion:(void (^)(EMError *aError))aCompletionBlock;
 
 /*!
  *  Import multiple conversations to DB
  *
- *  @param aConversations  Conversation list<EMConversation>
+ *  @param aConversations   Conversation list<EMConversation>
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Whether imported successfully
  */
-- (BOOL)importConversations:(NSArray *)aConversations;
+- (void)importConversations:(NSArray *)aConversations
+                 completion:(void (^)(EMError *aError))aCompletionBlock;
 
 #pragma mark - Message
 
 /*!
- *  Get message attachment path for the conversation, files in this path will also be deleted when delete the conversation
+ *  Get message attachment local path for the conversation. Delete the conversation will also delete the files under the file path.
  *
  *  @param aConversationId  Conversation id
  *
@@ -123,85 +124,76 @@
  *  Import multiple messages
  *
  *  @param aMessages  Message list<EMMessage>
+ *  @param aCompletionBlock The callback block of completion
  *
- *  @result Whether imported successfully
  */
-- (BOOL)importMessages:(NSArray *)aMessages;
+- (void)importMessages:(NSArray *)aMessages
+            completion:(void (^)(EMError *aError))aCompletionBlock;
 
 /*!
- *  Update message to DB
+ *  Update message
  *
  *  @param aMessage  Message
+ *  @param aSuccessBlock    The callback block of completion
  *
- *  @result Whether updated successfully
  */
-- (BOOL)updateMessage:(EMMessage *)aMessage;
+- (void)updateMessage:(EMMessage *)aMessage
+           completion:(void (^)(EMMessage *aMessage, EMError *aError))aCompletionBlock;
 
 /*!
- *  Send read ack for message
+ *  Send read acknowledgement for message
  *
- *  Asynchronous methods
  *
  *  @param aMessage  Message instance
+ *  @param aCompletionBlock    The callback block of completion
+ *
  */
-- (void)asyncSendReadAckForMessage:(EMMessage *)aMessage;
+- (void)sendMessageReadAck:(EMMessage *)aMessage
+                     completion:(void (^)(EMMessage *aMessage, EMError *aError))aCompletionBlock;
 
 /*!
  *  Send a message
  *
- *  Asynchronous methods
  *
  *  @param aMessage            Message instance
- *  @param aProgressCompletion The block of attachment upload progress
- *
+ *  @param aProgressBlock      The block of attachment upload progress
  *  @param aCompletion         The block of send complete
  */
-- (void)asyncSendMessage:(EMMessage *)aMessage
-                progress:(void (^)(int progress))aProgressCompletion
-              completion:(void (^)(EMMessage *message,
-                                   EMError *error))aCompletion;
+- (void)sendMessage:(EMMessage *)aMessage
+           progress:(void (^)(int progress))aProgressBlock
+         completion:(void (^)(EMMessage *message, EMError *error))aCompletionBlock;
 
 /*!
  *  Resend Message
  *
- *  Asynchronous methods
- *
- *  @param aMessage            Message instance
- *  @param aProgressCompletion The callback block of attachment upload progress
- *  @param aCompletion         The callback block of send complete
+ *  @param aMessage         Message instance
+ *  @param aProgressBlock   The callback block of attachment upload progress
+ *  @param aCompletion      The callback block of send complete
  */
-- (void)asyncResendMessage:(EMMessage *)aMessage
-                  progress:(void (^)(int progress))aProgressCompletion
-                completion:(void (^)(EMMessage *message,
-                                     EMError *error))aCompletion;
+- (void)resendMessage:(EMMessage *)aMessage
+                  progress:(void (^)(int progress))aProgressBlock
+                completion:(void (^)(EMMessage *message, EMError *error))aCompletionBlock;
 
 /*!
- *  Download message thumbnail attachments (thumbnails of image message or first frame of video image), SDK can download thumbail automatically, so user should NOT download thumbail manually except automatic download failed
- *
- *  Asynchronous methods
+ *  Download message thumbnail (thumbnail of image message or first frame of video image), SDK downloads thumbails automatically, no need to download thumbail manually unless automatic download failed.
  *
  *  @param aMessage            Message instance
- *  @param aProgressCompletion The callback block of attachment download progress
+ *  @param aProgressBlock      The callback block of attachment download progress
  *  @param aCompletion         The callback block of download complete
  */
-- (void)asyncDownloadMessageThumbnail:(EMMessage *)aMessage
-                             progress:(void (^)(int progress))aProgressCompletion
-                           completion:(void (^)(EMMessage * message,
-                                                EMError *error))aCompletion;
+- (void)downloadMessageThumbnail:(EMMessage *)aMessage
+                        progress:(void (^)(int progress))aProgressBlock
+                      completion:(void (^)(EMMessage *message, EMError *error))aCompletionBlock;
 
 /*!
- *  Download message attachment(voice, video, image or file), SDK can download voice automatically, so user should NOT download voice manually except automatic download failed
+ *  Download message attachment(voice, video, image or file), SDK downloads attachment automatically, no need to download attachment manually unless automatic download failed
  *
- *  Asynchronous methods
  *
  *  @param aMessage            Message instance
- *  @param aProgressCompletion The callback block of attachment download progress
+ *  @param aProgressBlock      The callback block of attachment download progress
  *  @param aCompletion         The callback block of download complete
  */
-- (void)asyncDownloadMessageAttachments:(EMMessage *)aMessage
-                               progress:(void (^)(int progress))aProgressCompletion
-                             completion:(void (^)(EMMessage *message,
-                                                  EMError *error))aCompletion;
-
-
+- (void)downloadMessageAttachment:(EMMessage *)aMessage
+                         progress:(void (^)(int progress))aProgressBlock
+                       completion:(void (^)(EMMessage *message, EMError *error))aCompletionBlock;
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/IEMChatroomManager.h b/HyphenateSDK/HyphenateFull-SDK/include/IEMChatroomManager.h
index c531417..7bc47b0 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/IEMChatroomManager.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/IEMChatroomManager.h
@@ -1,6 +1,6 @@
 /*!
  *  @header IEMChatroomManager.h
- *  @abstract This protocol defined the chatroom operations
+ *  @abstract This protocol defines the chat room operations
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -30,6 +30,13 @@
 - (void)addDelegate:(id<EMChatroomManagerDelegate>)aDelegate
       delegateQueue:(dispatch_queue_t)aQueue;
 
+/*!
+ *  Add delegate
+ *
+ *  @param aDelegate  Delegate
+ */
+- (void)addDelegate:(id<EMChatroomManagerDelegate>)aDelegate;
+
 /*!
  *  Remove delegate
  *
@@ -37,40 +44,45 @@
  */
 - (void)removeDelegate:(id<EMChatroomManagerDelegate>)aDelegate;
 
+#pragma mark - Async method
 
 /*!
  *  Get all the chatrooms from server
  *
- *  @param aSuccessBlock         The callback block of success
- *  @param aFailureBlock         The callback block of failure
+ *  @param aCompletionBlock     The callback block of completion
  *
  */
-- (void)asyncGetAllChatroomsFromServer:(void (^)(NSArray *aList))aSuccessBlock
-                               failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getAllChatroomsFromServerWithCompletion:(void (^)(NSArray *aList, EMError *aError))aCompletionBlock;
 
 /*!
  *  Join a chatroom
  *
  *  @param aChatroomId      Chatroom id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock     The callback block of completion
  *
  */
-- (void)asyncJoinChatroom:(NSString *)aChatroomId
-                  success:(void (^)(EMChatroom *aRoom))aSuccessBlock
-                  failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)joinChatroom:(NSString *)aChatroomId
+          completion:(void (^)(EMChatroom *aChatroom, EMError *aError))aCompletionBlock;
 
 /*!
  *  Leave a chatroom
  *
  *  @param aChatroomId      Chatroom id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock     The callback block of completion
  *
- *  @result Leaved chatroom
  */
-- (void)asyncLeaveChatroom:(NSString *)aChatroomId
-                   success:(void (^)(EMChatroom *aRoom))aSuccessBlock
-                   failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)leaveChatroom:(NSString *)aChatroomId
+           completion:(void (^)(EMChatroom *aChatroom, EMError *aError))aCompletionBlock;
 
+/*!
+ *  Fetch chat room specifications
+ *
+ *  @param aChatroomId           Chatroom id
+ *  @param aIncludeMembersList   Whether to get member list
+ *  @param aCompletionBlock      The callback block of completion
+ *
+ */
+- (void)getChatroomSpecificationFromServerByID:(NSString *)aChatroomId
+                            includeMembersList:(BOOL)aIncludeMembersList
+                                    completion:(void (^)(EMChatroom *aChatroom, EMError *aError))aCompletionBlock;
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/IEMContactManager.h b/HyphenateSDK/HyphenateFull-SDK/include/IEMContactManager.h
index ab91169..a342ff8 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/IEMContactManager.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/IEMContactManager.h
@@ -1,6 +1,6 @@
 /*!
  *  @header IEMContactManager.h
- *  @abstract This protocol defined the operations of contact
+ *  @abstract The protocol defines the operations of contact
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -12,7 +12,7 @@
 @class EMError;
 
 /*!
- *  Operations of contact
+ *  Contact Management
  */
 @protocol IEMContactManager <NSObject>
 
@@ -30,139 +30,110 @@
       delegateQueue:(dispatch_queue_t)aQueue;
 
 /*!
- *  Remove delegate
+ *  Add delegate
  *
  *  @param aDelegate  Delegate
  */
-- (void)removeDelegate:(id)aDelegate;
-
-#pragma mark - White List
+- (void)addDelegate:(id<EMContactManagerDelegate>)aDelegate;
 
 /*!
- *  Get all friends from memory
+ *  Remove delegate
  *
- *  @result Contact list<EMGroup>
+ *  @param aDelegate  Delegate
  */
-- (NSArray *)getContacts;
+- (void)removeDelegate:(id)aDelegate;
 
 /*!
- *  Get all the friends from the DB
+ *  Get all contacts
  *
- *  @return Contact list<NSString>
+ *  @result Contact list<EMGroup>
  */
-- (NSArray *)getContactsFromDB;
-
-#pragma mark - Black List
+- (NSArray *)getContacts;
 
 /*!
- *  Get the blacklist from memory
+ *  Get the blacklist of blocked users
  *
  *  @result Blacklist<EMGroup>
  */
 - (NSArray *)getBlackList;
 
-/*!
- *  Get the blacklist from the DB
- *
- *  @return Blacklist<NSString>
- */
-- (NSArray *)getBlackListFromDB;
-
+#pragma mark - Async method
 
 /*!
- *  Get all the friends from the server
+ *  Get all contacts from the server
  *
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncGetContactsFromServer:(void (^)(NSArray *aList))aSuccessBlock
-                           failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getContactsFromServerWithCompletion:(void (^)(NSArray *aList, EMError *aError))aCompletionBlock;
 
 /*!
  *  Add a contact
  *
- *  @param aUsername        The user to add
- *  @param aMessage         Friend invitation message
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        The user to be added
+ *  @param aMessage         Friend request message
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncAddContact:(NSString *)aUsername
-                message:(NSString *)aMessage
-                success:(void (^)())aSuccessBlock
-                failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)addContact:(NSString *)aUsername
+           message:(NSString *)aMessage
+        completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
- *  Delete friend
+ *  Delete a contact
  *
- *  @param aUsername        The user to delete
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        The user to be deleted
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncDeleteContact:(NSString *)aUsername
-                   success:(void (^)())aSuccessBlock
-                   failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)deleteContact:(NSString *)aUsername
+           completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
  *  Get the blacklist from the server
  *
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncGetBlackListFromServer:(void (^)(NSArray *aList))aSuccessBlock
-                            failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getBlackListFromServerWithCompletion:(void (^)(NSArray *aList, EMError *aError))aCompletionBlock;
 
 /*!
- *  Add user to blacklist
+ *  Add a user to blacklist
  *
- *  @param aUsername        The user to add
- *  @param aBoth            Whether block messages from me to the user which is added to the black list
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        Block user
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncAddUserToBlackList:(NSString *)aUsername
-               relationshipBoth:(BOOL)aBoth
-                        success:(void (^)())aSuccessBlock
-                        failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)addUserToBlackList:(NSString *)aUsername
+                completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
- *  Remove user from blacklist
+ *  Remove a user from blacklist
  *
- *  @param aUsername        The user to remove from blacklist
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        Unblock user
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncRemoveUserFromBlackList:(NSString *)aUsername
-                             success:(void (^)())aSuccessBlock
-                             failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)removeUserFromBlackList:(NSString *)aUsername
+                     completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
- *  Agree invitation
+ *  Apporove a friend request
  *
- *  @param aUsername        Applicants
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        User who initiated the friend request
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncAcceptInvitationForUsername:(NSString *)aUsername
-                                 success:(void (^)())aSuccessBlock
-                                 failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)approveFriendRequestFromUser:(NSString *)aUsername
+                          completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 
 /*!
- *  Decline invitation
+ *  Decline a friend request
  *
- *  @param aUsername        Applicants
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        User who initiated the friend request
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncDeclineInvitationForUsername:(NSString *)aUsername
-                                  success:(void (^)())aSuccessBlock
-                                  failure:(void (^)(EMError *aError))aFailureBlock;
-
+- (void)declineFriendRequestFromUser:(NSString *)aUsername
+                          completion:(void (^)(NSString *aUsername, EMError *aError))aCompletionBlock;
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/IEMGroupManager.h b/HyphenateSDK/HyphenateFull-SDK/include/IEMGroupManager.h
index c10583f..0e90923 100644
--- a/HyphenateSDK/HyphenateFull-SDK/include/IEMGroupManager.h
+++ b/HyphenateSDK/HyphenateFull-SDK/include/IEMGroupManager.h
@@ -1,6 +1,6 @@
 /*!
  *  @header IEMGroupManager.h
- *  @abstract This protocol defined the group operations
+ *  @abstract This protocol defines the group operations
  *  @author Hyphenate
  *  @version 3.00
  */
@@ -30,6 +30,13 @@
 - (void)addDelegate:(id<EMGroupManagerDelegate>)aDelegate
       delegateQueue:(dispatch_queue_t)aQueue;
 
+/*!
+ *  Add delegate
+ *
+ *  @param aDelegate  Delegate
+ */
+- (void)addDelegate:(id<EMGroupManagerDelegate>)aDelegate;
+
 /*!
  *  Remove delegate
  *
@@ -40,62 +47,51 @@
 #pragma mark - Get Group
 
 /*!
- *  Get all groups, will load from DB if not exist in memory
+ *  Get all groups
  *
  *  @result Group list<EMGroup>
- */
-- (NSArray *)getAllGroups;
-
-/*!
- *  Load all groups from DB, will update group list in memory after loading
  *
- *  @result Group list<EMGroup>
  */
-- (NSArray *)loadAllMyGroupsFromDB;
+- (NSArray *)getJoinedGroups;
 
 /*!
- *  Get ID list of groups which block push from memory
+ *  Get the list of groups which have disabled Apple Push Notification Service
  *
- *  @result Group id list<NSString>
+ *  @param pError  Error
  */
-- (NSArray *)getAllIgnoredGroupIds;
+- (NSArray *)getGroupsWithoutPushNotification:(EMError **)pError;
 
+#pragma mark - Async method
 
 /**
- *  Get all of user's groups from server, will update group list in memory and DB after success
+ *  Get all of user's groups from server
  *
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncGetMyGroupsFromServer:(void (^)(NSArray *aList))aSuccessBlock
-                           failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getJoinedGroupsFromServerWithCompletion:(void (^)(NSArray *aList, EMError *aError))aCompletionBlock;
 
 /*!
- *  Get public groups in the specified range from the server
+ *  Get public groups with the specified range from the server
  *
  *  @param aCursor          Cursor, input nil the first time
- *  @param aPageSize        Expect result count, will return all results if < 0
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aPageSize        Expect result count, return all results if count is less than zero
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncGetPublicGroupsFromServerWithCursor:(NSString *)aCursor
-                                        pageSize:(NSInteger)aPageSize
-                                         success:(void (^)(EMCursorResult *aCursor))aSuccessBlock
-                                         failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getPublicGroupsFromServerWithCursor:(NSString *)aCursor
+                                   pageSize:(NSInteger)aPageSize
+                                 completion:(void (^)(EMCursorResult *aResult, EMError *aError))aCompletionBlock;
 
 /*!
- *  Search public group with the id
+ *  Search public group with group id
  *
  *  @param aGroundId        Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncSearchPublicGroupWithId:(NSString *)aGroundId
-                             success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                             failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)searchPublicGroupWithId:(NSString *)aGroundId
+                     completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
  *  Create a group
@@ -105,276 +101,236 @@
  *  @param aInvitees        Group members, without creater
  *  @param aMessage         Invitation message
  *  @param aSetting         Group options
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncCreateGroupWithSubject:(NSString *)aSubject
-                        description:(NSString *)aDescription
-                           invitees:(NSArray *)aInvitees
-                            message:(NSString *)aMessage
-                            setting:(EMGroupOptions *)aSetting
-                            success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                            failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)createGroupWithSubject:(NSString *)aSubject
+                   description:(NSString *)aDescription
+                      invitees:(NSArray *)aInvitees
+                       message:(NSString *)aMessage
+                       setting:(EMGroupOptions *)aSetting
+                    completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Fetch group info
+ *  Fetch group specification
  *
  *  @param aGroupId              Group id
- *  @param aIncludeMembersList   Whether get member list
- *  @param aSuccessBlock         The callback block of success
- *  @param aFailureBlock         The callback block of failure
+ *  @param aIncludeMembersList   Whether to get member list
+ *  @param aCompletionBlock      The callback block of completion
  *
  */
-- (void)asyncFetchGroupInfo:(NSString *)aGroupId
-         includeMembersList:(BOOL)aIncludeMembersList
-                    success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                    failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getGroupSpecificationFromServerByID:(NSString *)aGroupID
+                         includeMembersList:(BOOL)aIncludeMembersList
+                                 completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Get group‘s blacklist, need owner’s authority
+ *  Get group's blacklist, owner’s authority is required
  *
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncFetchGroupBansList:(NSString *)aGroupId
-                        success:(void (^)(NSArray *aList))aSuccessBlock
-                        failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)getGroupBlackListFromServerByID:(NSString *)aGroupId
+                             completion:(void (^)(NSArray *aList, EMError *aError))aCompletionBlock;
 
 /*!
  *  Invite User to join a group
  *
- *  @param aOccupants       Invited users
+ *  @param aUsers           Invited users
  *  @param aGroupId         Group id
- *  @param aWelcomeMessage  Welcome message
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aMessage         Welcome message
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncAddOccupants:(NSArray *)aOccupants
-                  toGroup:(NSString *)aGroupId
-           welcomeMessage:(NSString *)aWelcomeMessage
-                  success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                  failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)addMembers:(NSArray *)aUsers
+           toGroup:(NSString *)aGroupId
+           message:(NSString *)aMessage
+        completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Remove members from group, need owner‘s authority
+ *  Remove members from a group, owner‘s authority is required
  *
- *  @param aOccupants       Users to be removed
+ *  @param aUsers           Users to be removed
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncRemoveOccupants:(NSArray *)aOccupants
-                   fromGroup:(NSString *)aGroupId
-                     success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                     failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)removeMembers:(NSArray *)aUsers
+            fromGroup:(NSString *)aGroupId
+           completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Add users to group’s blacklist, need owner‘s authority
+ *  Add users to group blacklist, owner‘s authority is required
  *
- *  @param aOccupants       Users to be added
+ *  @param aMembers         Users to be added
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncBlockOccupants:(NSArray *)aOccupants
-                  fromGroup:(NSString *)aGroupId
-                    success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                    failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)blockMembers:(NSArray *)aMembers
+           fromGroup:(NSString *)aGroupId
+          completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Remove users from group‘s blacklist, need owner‘s authority
+ *  Remove users out of group blacklist, owner‘s authority is required
  *
- *  @param aOccupants       Users to be removed
+ *  @param aMembers         Users to be removed
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncUnblockOccupants:(NSArray *)aOccupants
-                     forGroup:(NSString *)aGroupId
-                      success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                      failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)unblockMembers:(NSArray *)aMembers
+             fromGroup:(NSString *)aGroupId
+            completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Change group’s subject, need owner‘s authority
+ *  Change the group subject, owner‘s authority is required
  *
  *  @param aSubject         New group‘s subject
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncChangeGroupSubject:(NSString *)aSubject
-                       forGroup:(NSString *)aGroupId
-                        success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                        failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)updateGroupSubject:(NSString *)aSubject
+                  forGroup:(NSString *)aGroupId
+                completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Change group’s description, need owner‘s authority
+ *  Change the group description, owner‘s authority is required
  *
  *  @param aDescription     New group‘s description
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncChangeDescription:(NSString *)aDescription
-                      forGroup:(NSString *)aGroupId
-                       success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                       failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)updateDescription:(NSString *)aDescription
+                 forGroup:(NSString *)aGroupId
+               completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
  *  Leave a group, owner can't leave the group, can only destroy the group
  *
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncLeaveGroup:(NSString *)aGroupId
-                success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)leaveGroup:(NSString *)aGroupId
+        completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Destroy a group, need owner‘s authority
+ *  Destroy a group, owner‘s authority is required
  *
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncDestroyGroup:(NSString *)aGroupId
-                  success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                  failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)destroyGroup:(NSString *)aGroupId
+          completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Block group’s message, server will blocks the messages of the group to user, owner can't block the group's message
+ *  Block group messages, server blocks the messages from the group, owner can't block the group's messages
  *
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncBlockGroup:(NSString *)aGroupId
-                success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)blockGroup:(NSString *)aGroupId
+        completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
  *  Unblock group message
  *
  *  @param aGroupId         Group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncUnblockGroup:(NSString *)aGroupId
-                  success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                  failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)unblockGroup:(NSString *)aGroupId
+          completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
  *  Join a public group, group style should be EMGroupStylePublicOpenJoin
  *
  *  @param aGroupId         Public group id
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncJoinPublicGroup:(NSString *)aGroupId
-                     success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                     failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)joinPublicGroup:(NSString *)aGroupId
+            completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Apply to join a public group, group style should be EMGroupStylePublicJoinNeedApproval
+ *  Request to join a public group, group style should be EMGroupStylePublicJoinNeedApproval
  *
  *  @param aGroupId         Public group id
  *  @param aMessage         Apply info
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncApplyJoinPublicGroup:(NSString *)aGroupId
-                          message:(NSString *)aMessage
-                          success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                          failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)requestToJoinPublicGroup:(NSString *)aGroupId
+                         message:(NSString *)aMessage
+                      completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Accept user's application, need owner‘s authority
+ *  Approve a group request, owner‘s authority is required
  *
  *  @param aGroupId         Group id
- *  @param aUsername        The applicant
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aUsername        Group request sender
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncAcceptJoinApplication:(NSString *)aGroupId
-                         applicant:(NSString *)aUsername
-                           success:(void (^)())aSuccessBlock
-                           failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)approveJoinGroupRequest:(NSString *)aGroupId
+                         sender:(NSString *)aUsername
+                     completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Decline user's application, need owner‘s authority
+ *  Decline a group request, owner‘s authority is required
  *
  *  @param aGroupId         Group id
- *  @param aUsername        The applicant
+ *  @param aUsername        Group request sender
  *  @param aReason          Decline reason
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncDeclineJoinApplication:(NSString *)aGroupId
-                          applicant:(NSString *)aUsername
-                             reason:(NSString *)aReason
-                            success:(void (^)())aSuccessBlock
-                            failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)declineJoinGroupRequest:(NSString *)aGroupId
+                        sender:(NSString *)aUsername
+                        reason:(NSString *)aReason
+                    completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
- *  Accept group's invitation
+ *  Accept a group invitation
  *
  *  @param groupId          Group id
  *  @param aUsername        Inviter
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncAcceptInvitationFromGroup:(NSString *)aGroupId
-                               inviter:(NSString *)aUsername
-                               success:(void (^)(EMGroup *aGroup))aSuccessBlock
-                               failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)acceptInvitationFromGroup:(NSString *)aGroupId
+                           inviter:(NSString *)aUsername
+                        completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 /*!
  *  Decline a group invitation
  *
  *  @param aGroupId         Group id
- *  @param aUsername        Inviter
+ *  @param aInviter         Inviter
  *  @param aReason          Decline reason
- *  @param aSuccessBlock    The callback block of success
- *  @param aFailureBlock    The callback block of failure
+ *  @param aCompletionBlock The callback block of completion
  *
  */
-- (void)asyncDeclineInvitationFromGroup:(NSString *)aGroupId
-                                inviter:(NSString *)aUsername
-                                 reason:(NSString *)aReason
-                                success:(void (^)())aSuccessBlock
-                                failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)declineGroupInvitation:(NSString *)aGroupId
+                       inviter:(NSString *)aInviter
+                        reason:(NSString *)aReason
+                    completion:(void (^)(EMError *aError))aCompletionBlock;
 
 /*!
  *  Block / unblock group message‘s push notification
  *
  *  @param aGroupId          Group id
- *  @param aIgnore           Whether block
- *  @param aSuccessBlock     The callback block of success
- *  @param aFailureBlock     The callback block of failure
+ *  @param aIsEnable         Whether enable
+ *  @param aCompletionBlock  The callback block of completion
  *
  */
-- (void)asyncIgnoreGroupPush:(NSString *)aGroupId
-                      ignore:(BOOL)aIsIgnore
-                     success:(void (^)())aSuccessBlock
-                     failure:(void (^)(EMError *aError))aFailureBlock;
+- (void)updatePushServiceForGroup:(NSString *)aGroupID
+                    isPushEnabled:(BOOL)aIsEnable
+                       completion:(void (^)(EMGroup *aGroup, EMError *aError))aCompletionBlock;
 
 @end
diff --git a/HyphenateSDK/HyphenateFull-SDK/include/OpenGLView20.h b/HyphenateSDK/HyphenateFull-SDK/include/OpenGLView20.h
deleted file mode 100644
index 287f3d1..0000000
--- a/HyphenateSDK/HyphenateFull-SDK/include/OpenGLView20.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- *  @header OpenGLView20.h
- *  @abstract Video display view
- *  @author Hyphenate
- *  @version 3.00
- */
-
-#import <UIKit/UIKit.h>
-#import <CoreMedia/CoreMedia.h>
-
-@interface OpenGLView20 : UIView
-
-@property (nonatomic) BOOL isRunning;
-
-/*!
- @method
- @brief  将数据画到屏幕上
- @param data      数据
- @param width     宽度
- @param height    高度
- */
-- (void)displayYUV420pData:(char *)data width:(GLuint)width height:(GLuint)height;
-
-/*!
- @method
- @brief  设置视频显示区域大小
- @param width     宽度
- @param height    高度
- */
-- (void)setVideoSize:(GLuint)width height:(GLuint)height;
-
-/*!
- @method
- @brief  清除画面
- */
-- (void)clearFrame;
-
-@end
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libcrypto.a b/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libcrypto.a
deleted file mode 100644
index 4bf3bc5..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libcrypto.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libcurl.a b/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libcurl.a
deleted file mode 100644
index 249885d..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libcurl.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libssl.a b/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libssl.a
deleted file mode 100644
index 130fdd1..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/3rdparty/libssl.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK.a b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK.a
new file mode 100644
index 0000000..7f99486
Binary files /dev/null and b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK.a differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_arm64.a b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_arm64.a
deleted file mode 100644
index 9d90515..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_arm64.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_armv7.a b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_armv7.a
deleted file mode 100644
index 4a03f68..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_armv7.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_armv7s.a b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_armv7s.a
deleted file mode 100644
index 69464f8..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_armv7s.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_i386.a b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_i386.a
deleted file mode 100644
index 03907eb..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_i386.a and /dev/null differ
diff --git a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_x86_64.a b/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_x86_64.a
deleted file mode 100644
index 6b8888f..0000000
Binary files a/HyphenateSDK/HyphenateFull-SDK/lib/libHyphenateFullSDK_x86_64.a and /dev/null differ
diff --git a/HyphenateSDK/doc/Classes/EMCallLocalView.html b/HyphenateSDK/doc/Classes/EMCallLocalView.html
index 3f42215..bbbc8df 100644
--- a/HyphenateSDK/doc/Classes/EMCallLocalView.html
+++ b/HyphenateSDK/doc/Classes/EMCallLocalView.html
@@ -128,12 +128,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>frame</code></th>
-						<td><p>frame of localView</p></td>
+						<td><p>Frame of localView</p></td>
 					</tr>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>sessionPreset</code></th>
-						<td><p>output resolution,only support AVCaptureSessionPreset352x288 and AVCaptureSessionPreset640x480</p></td>
+						<td><p>AVCaptureSession output resolution, currently support AVCaptureSessionPreset352x288 and AVCaptureSessionPreset640x480</p></td>
 					</tr>
 				
 				</table>
@@ -143,7 +143,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Get instance of LocalView</p>
+				<p>Returns a LocalView instance</p>
 			</div>
 			
 
@@ -184,7 +184,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMCallSession.html b/HyphenateSDK/doc/Classes/EMCallSession.html
index a9f4510..215c349 100644
--- a/HyphenateSDK/doc/Classes/EMCallSession.html
+++ b/HyphenateSDK/doc/Classes/EMCallSession.html
@@ -82,29 +82,29 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/getVideoFramerate">- getVideoFramerate</option>
+		<option value="//api/name/getVideoFrameRate">- getVideoFrameRate</option>
 		
 		<option value="//api/name/getVideoHeight">- getVideoHeight</option>
 		
+		<option value="//api/name/getVideoLatency">- getVideoLatency</option>
+		
 		<option value="//api/name/getVideoLocalBitrate">- getVideoLocalBitrate</option>
 		
-		<option value="//api/name/getVideoLostcnt">- getVideoLostcnt</option>
+		<option value="//api/name/getVideoLostRateInPercent">- getVideoLostRateInPercent</option>
 		
 		<option value="//api/name/getVideoRemoteBitrate">- getVideoRemoteBitrate</option>
 		
-		<option value="//api/name/getVideoTimedelay">- getVideoTimedelay</option>
-		
 		<option value="//api/name/getVideoWidth">- getVideoWidth</option>
 		
 		<option value="//api/name/getVoiceVolume">- getVoiceVolume</option>
 		
-		<option value="//api/name/setCameraBackOrFront:">- setCameraBackOrFront:</option>
+		<option value="//api/name/screenCaptureToFilePath:error:">- screenCaptureToFilePath:error:</option>
 		
-		<option value="//api/name/startVideoRecord:">- startVideoRecord:</option>
+		<option value="//api/name/startVideoRecordingToFilePath:error:">- startVideoRecordingToFilePath:error:</option>
 		
-		<option value="//api/name/stopVideoRecord">- stopVideoRecord</option>
+		<option value="//api/name/stopVideoRecording:">- stopVideoRecording:</option>
 		
-		<option value="//api/name/takeRemotePicture:">- takeRemotePicture:</option>
+		<option value="//api/name/switchCameraPosition:">- switchCameraPosition:</option>
 		
 	</optgroup>
 	
@@ -259,7 +259,7 @@ <h3 class="method-title"><code><a href="#//api/name/remoteUsername">&nbsp;&nbsp;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The other side&rsquo;s <a href="#//api/name/username">username</a></p>
+				<p>The other party&rsquo;s <a href="#//api/name/username">username</a></p>
 			</div>
 			
 		    
@@ -276,7 +276,7 @@ <h3 class="method-title"><code><a href="#//api/name/remoteUsername">&nbsp;&nbsp;
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The other side&rsquo;s <a href="#//api/name/username">username</a></p>
+				<p>The other party&rsquo;s <a href="#//api/name/username">username</a></p>
 			</div>
 			
 
@@ -489,7 +489,7 @@ <h3 class="method-title"><code><a href="#//api/name/remoteVideoView">&nbsp;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remote display view</p>
+				<p>The other party&rsquo;s display view</p>
 			</div>
 			
 		    
@@ -506,7 +506,7 @@ <h3 class="method-title"><code><a href="#//api/name/remoteVideoView">&nbsp;&nbsp
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remote display view</p>
+				<p>The other party&rsquo;s display view</p>
 			</div>
 			
 
@@ -535,7 +535,7 @@ <h3 class="method-title"><code><a href="#//api/name/videoBitrate">&nbsp;&nbsp;vi
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Set video bit rate, must set before start the session</p>
+				<p>Video bit rate, must be set before call session is started.</p>
 			</div>
 			
 		    
@@ -552,9 +552,9 @@ <h3 class="method-title"><code><a href="#//api/name/videoBitrate">&nbsp;&nbsp;vi
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Set video bit rate, must set before start the session</p>
+				<p>Video bit rate, must be set before call session is started.</p>
 
-<p>Value is 150-1000, the default is 600</p>
+<p>Value range is 150-1000, the default is 600.</p>
 			</div>
 			
 
@@ -583,7 +583,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVoiceVolume">&ndash;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get voice volume</p>
+				<p>Get voice volume of the call</p>
 			</div>
 			
 		    
@@ -605,7 +605,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get voice volume</p>
+				<p>Get voice volume of the call</p>
 			</div>
 			
 
@@ -623,8 +623,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getVideoTimedelay" title="getVideoTimedelay"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getVideoTimedelay">&ndash;&nbsp;getVideoTimedelay</a></code>
+	<a name="//api/name/getVideoLatency" title="getVideoLatency"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getVideoLatency">&ndash;&nbsp;getVideoLatency</a></code>
 </h3>
 
 	<div class="method-info">
@@ -634,12 +634,12 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoTimedelay">&ndash;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get video delay time, in milliseconds, it&rsquo;s real time changed</p>
+				<p>Get video latency, in milliseconds, changing in real time</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (int)getVideoTimedelay</code></div>
+			<div class="method-subsection method-declaration"><code>- (int)getVideoLatency</code></div>
 
 		    
 			
@@ -656,7 +656,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get video delay time, in milliseconds, it&rsquo;s real time changed</p>
+				<p>Get video latency, in milliseconds, changing in real time</p>
 			</div>
 			
 
@@ -674,8 +674,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getVideoFramerate" title="getVideoFramerate"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getVideoFramerate">&ndash;&nbsp;getVideoFramerate</a></code>
+	<a name="//api/name/getVideoFrameRate" title="getVideoFrameRate"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getVideoFrameRate">&ndash;&nbsp;getVideoFrameRate</a></code>
 </h3>
 
 	<div class="method-info">
@@ -685,12 +685,12 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoFramerate">&ndash;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get video frame rate, it&rsquo;s real time changed</p>
+				<p>Get video frame rate, changing in real time</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (int)getVideoFramerate</code></div>
+			<div class="method-subsection method-declaration"><code>- (int)getVideoFrameRate</code></div>
 
 		    
 			
@@ -698,7 +698,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoFramerate">&ndash;&n
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>The frame rate</p>
+				<p>The video frame rate</p>
 			</div>
 			
 
@@ -707,7 +707,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get video frame rate, it&rsquo;s real time changed</p>
+				<p>Get video frame rate, changing in real time</p>
 			</div>
 			
 
@@ -725,8 +725,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getVideoLostcnt" title="getVideoLostcnt"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getVideoLostcnt">&ndash;&nbsp;getVideoLostcnt</a></code>
+	<a name="//api/name/getVideoLostRateInPercent" title="getVideoLostRateInPercent"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getVideoLostRateInPercent">&ndash;&nbsp;getVideoLostRateInPercent</a></code>
 </h3>
 
 	<div class="method-info">
@@ -741,7 +741,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoLostcnt">&ndash;&nbs
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (int)getVideoLostcnt</code></div>
+			<div class="method-subsection method-declaration"><code>- (int)getVideoLostRateInPercent</code></div>
 
 		    
 			
@@ -749,7 +749,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoLostcnt">&ndash;&nbs
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Package lost rate</p>
+				<p>Video package lost rate</p>
 			</div>
 			
 
@@ -787,7 +787,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoWidth">&ndash;&nbsp;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get video width, fix size, it&rsquo;s not real time changed</p>
+				<p>Get video original width</p>
 			</div>
 			
 		    
@@ -800,7 +800,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoWidth">&ndash;&nbsp;
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Video width</p>
+				<p>Video original width</p>
 			</div>
 			
 
@@ -809,7 +809,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get video width, fix size, it&rsquo;s not real time changed</p>
+				<p>Get video original width</p>
 			</div>
 			
 
@@ -838,7 +838,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoHeight">&ndash;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get video height, fix size, it&rsquo;s not real time changed</p>
+				<p>Get fixed video original height</p>
 			</div>
 			
 		    
@@ -851,7 +851,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoHeight">&ndash;&nbsp
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Video height</p>
+				<p>Video original height</p>
 			</div>
 			
 
@@ -860,7 +860,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get video height, fix size, it&rsquo;s not real time changed</p>
+				<p>Get fixed video original height</p>
 			</div>
 			
 
@@ -889,7 +889,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoRemoteBitrate">&ndas
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get another peer&rsquo;s bitrate, it&rsquo;s real time changed</p>
+				<p>Get the other party&rsquo;s bitrate, changing in real time</p>
 			</div>
 			
 		    
@@ -902,7 +902,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoRemoteBitrate">&ndas
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Another peer&rsquo;s bitrate</p>
+				<p>The other party&rsquo;s bitrate</p>
 			</div>
 			
 
@@ -911,7 +911,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get another peer&rsquo;s bitrate, it&rsquo;s real time changed</p>
+				<p>Get the other party&rsquo;s bitrate, changing in real time</p>
 			</div>
 			
 
@@ -940,7 +940,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoLocalBitrate">&ndash
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get bitrate of video call, it&rsquo;s real time changed</p>
+				<p>Get bitrate of video call, changing in real time</p>
 			</div>
 			
 		    
@@ -953,7 +953,7 @@ <h3 class="method-title"><code><a href="#//api/name/getVideoLocalBitrate">&ndash
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Bitrate of video</p>
+				<p>Bitrate of video call</p>
 			</div>
 			
 
@@ -962,7 +962,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get bitrate of video call, it&rsquo;s real time changed</p>
+				<p>Get bitrate of video call, changing in real time</p>
 			</div>
 			
 
@@ -980,8 +980,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/takeRemotePicture:" title="takeRemotePicture:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/takeRemotePicture:">&ndash;&nbsp;takeRemotePicture:</a></code>
+	<a name="//api/name/screenCaptureToFilePath:error:" title="screenCaptureToFilePath:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/screenCaptureToFilePath:error:">&ndash;&nbsp;screenCaptureToFilePath:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -991,12 +991,12 @@ <h3 class="method-title"><code><a href="#//api/name/takeRemotePicture:">&ndash;&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get snapshot of video</p>
+				<p>Get a snapshot of current video screen as jpeg picture and save to the local file system.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)takeRemotePicture:(NSString *)<em>aFullPath</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)screenCaptureToFilePath:(NSString *)<em>aPath</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -1005,8 +1005,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFullPath</code></th>
-						<td><p>Save path of picture</p></td>
+						<th scope="row" class="argument-name"><code>aPath</code></th>
+						<td><p>Saved path of picture</p></td>
 					</tr>
 				
 				</table>
@@ -1020,7 +1020,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get snapshot of video</p>
+				<p>Get a snapshot of current video screen as jpeg picture and save to the local file system.</p>
 			</div>
 			
 
@@ -1038,8 +1038,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/startVideoRecord:" title="startVideoRecord:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/startVideoRecord:">&ndash;&nbsp;startVideoRecord:</a></code>
+	<a name="//api/name/startVideoRecordingToFilePath:error:" title="startVideoRecordingToFilePath:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/startVideoRecordingToFilePath:error:">&ndash;&nbsp;startVideoRecordingToFilePath:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1049,27 +1049,21 @@ <h3 class="method-title"><code><a href="#//api/name/startVideoRecord:">&ndash;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Start recording video</p>
+				<ul>
+<li>Start recording video
+*</li>
+<li>@param aPath            File saved path</li>
+<li>@param aError           Error</li>
+</ul>
+
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)startVideoRecord:(NSString *)<em>aPath</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)startVideoRecordingToFilePath:(NSString *)<em>aPath</em> error:(EMError **)<em>aError</em></code></div>
 
 		    
 			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aPath</code></th>
-						<td><p>File save path</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
 
 			
 
@@ -1078,7 +1072,15 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Start recording video</p>
+				<ul>
+<li>Start recording video
+*</li>
+<li>@param aPath            File saved path</li>
+<li>@param aError           Error</li>
+</ul>
+
+
+<p>*</p>
 			</div>
 			
 
@@ -1096,8 +1098,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/stopVideoRecord" title="stopVideoRecord"></a>
-	<h3 class="method-title"><code><a href="#//api/name/stopVideoRecord">&ndash;&nbsp;stopVideoRecord</a></code>
+	<a name="//api/name/stopVideoRecording:" title="stopVideoRecording:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/stopVideoRecording:">&ndash;&nbsp;stopVideoRecording:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1112,21 +1114,28 @@ <h3 class="method-title"><code><a href="#//api/name/stopVideoRecord">&ndash;&nbs
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSString *)stopVideoRecord</code></div>
+			<div class="method-subsection method-declaration"><code>- (NSString *)stopVideoRecording:(EMError **)<em>aError</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>path of record file</p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aError</code></th>
+						<td><p>Error</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>Stop recording video</p>
@@ -1147,8 +1156,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/setCameraBackOrFront:" title="setCameraBackOrFront:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/setCameraBackOrFront:">&ndash;&nbsp;setCameraBackOrFront:</a></code>
+	<a name="//api/name/switchCameraPosition:" title="switchCameraPosition:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/switchCameraPosition:">&ndash;&nbsp;switchCameraPosition:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1158,12 +1167,12 @@ <h3 class="method-title"><code><a href="#//api/name/setCameraBackOrFront:">&ndas
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Use front camera or back camera,default use front</p>
+				<p>Use front camera or back camera, default use front</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)setCameraBackOrFront:(BOOL)<em>isFont</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)switchCameraPosition:(BOOL)<em>aIsFrontCamera</em></code></div>
 
 		    
 			
@@ -1172,8 +1181,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>isFont</code></th>
-						<td><p>Weather use front camera or not,Yes is Front,No is Back</p></td>
+						<th scope="row" class="argument-name"><code>aIsFrontCamera</code></th>
+						<td><p>YES for front camera, NO for back camera.</p></td>
 					</tr>
 				
 				</table>
@@ -1187,7 +1196,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Use front camera or back camera,default use front</p>
+				<p>Use front camera or back camera, default use front</p>
 			</div>
 			
 
@@ -1219,7 +1228,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMChatroom.html b/HyphenateSDK/doc/Classes/EMChatroom.html
index 55b2beb..038107f 100644
--- a/HyphenateSDK/doc/Classes/EMChatroom.html
+++ b/HyphenateSDK/doc/Classes/EMChatroom.html
@@ -56,11 +56,13 @@ <h1 id="library-title">
 	
 	<optgroup label="Properties">
 		
+		<option value="//api/name/)">)</option>
+		
 		<option value="//api/name/chatroomId">chatroomId</option>
 		
 		<option value="//api/name/description">description</option>
 		
-		<option value="//api/name/maxOccupantsCount">maxOccupantsCount</option>
+		<option value="//api/name/owner">owner</option>
 		
 		<option value="//api/name/subject">subject</option>
 		
@@ -114,7 +116,7 @@ <h1 class="title">EMChatroom Class Reference</h1>
 					<div class="section section-overview">
 						<a title="Overview" name="overview"></a>
 						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Chatroom</p>
+						<p>Chat room object</p>
 					</div>
 					
 					
@@ -141,7 +143,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatroomId">&nbsp;&nbsp;chat
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Chatroom id</p>
+				<p>Chat room id</p>
 			</div>
 			
 		    
@@ -158,7 +160,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatroomId">&nbsp;&nbsp;chat
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Chatroom id</p>
+				<p>Chat room id</p>
 			</div>
 			
 
@@ -187,7 +189,7 @@ <h3 class="method-title"><code><a href="#//api/name/subject">&nbsp;&nbsp;subject
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Subject of chatroom</p>
+				<p>Subject of chat room</p>
 			</div>
 			
 		    
@@ -204,7 +206,7 @@ <h3 class="method-title"><code><a href="#//api/name/subject">&nbsp;&nbsp;subject
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Subject of chatroom</p>
+				<p>Subject of chat room</p>
 			</div>
 			
 
@@ -233,7 +235,7 @@ <h3 class="method-title"><code><a href="#//api/name/description">&nbsp;&nbsp;des
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Description of chatroom</p>
+				<p>Description of chat room</p>
 			</div>
 			
 		    
@@ -250,7 +252,53 @@ <h3 class="method-title"><code><a href="#//api/name/description">&nbsp;&nbsp;des
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Description of chatroom</p>
+				<p>Description of chat room</p>
+			</div>
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">EMChatroom.h</code></p>
+			</div>
+			
+			
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/owner" title="owner"></a>
+	<h3 class="method-title"><code><a href="#//api/name/owner">&nbsp;&nbsp;owner</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+			
+			
+			<div class="method-subsection brief-description">
+				<p>Owner of the chat room. Only one owner per chat room.</p>
+			</div>
+			
+		    
+
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *owner</code></div>
+
+		    
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>Owner of the chat room. Only one owner per chat room.</p>
 			</div>
 			
 
@@ -268,8 +316,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/maxOccupantsCount" title="maxOccupantsCount"></a>
-	<h3 class="method-title"><code><a href="#//api/name/maxOccupantsCount">&nbsp;&nbsp;maxOccupantsCount</a></code>
+	<a name="//api/name/)" title=")"></a>
+	<h3 class="method-title"><code><a href="#//api/name/)">&nbsp;&nbsp;)</a></code>
 </h3>
 
 	<div class="method-info">
@@ -279,12 +327,12 @@ <h3 class="method-title"><code><a href="#//api/name/maxOccupantsCount">&nbsp;&nb
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The maximum number of members</p>
+				<p>The total number of <a href="#//api/name/members">members</a> in the chat room</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSInteger maxOccupantsCount</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSInteger occupantsCount __deprecated_msg ( &quot;Use - membersCount&quot; )</code></div>
 
 		    
 			
@@ -296,7 +344,7 @@ <h3 class="method-title"><code><a href="#//api/name/maxOccupantsCount">&nbsp;&nb
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The maximum number of members</p>
+				<p>The total number of <a href="#//api/name/members">members</a> in the chat room</p>
 			</div>
 			
 
@@ -378,7 +426,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatroomWithId:">+&nbsp;chat
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Create chatroom instance</p>
+				<p>Construct a chatroom instance with chatroom id</p>
 			</div>
 			
 		    
@@ -412,7 +460,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Create chatroom instance</p>
+				<p>Construct a chatroom instance with chatroom id</p>
 			</div>
 			
 
@@ -444,7 +492,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMClient.html b/HyphenateSDK/doc/Classes/EMClient.html
index 8d3120f..60c5119 100644
--- a/HyphenateSDK/doc/Classes/EMClient.html
+++ b/HyphenateSDK/doc/Classes/EMClient.html
@@ -94,33 +94,35 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
+		<option value="//api/name/addDelegate:">- addDelegate:</option>
+		
 		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
 		
 		<option value="//api/name/applicationDidEnterBackground:">- applicationDidEnterBackground:</option>
 		
 		<option value="//api/name/applicationWillEnterForeground:">- applicationWillEnterForeground:</option>
 		
-		<option value="//api/name/asyncBindDeviceToken:success:failure:">- asyncBindDeviceToken:success:failure:</option>
+		<option value="//api/name/getPushNotificationOptionsFromServerWithCompletion:">- getPushNotificationOptionsFromServerWithCompletion:</option>
 		
-		<option value="//api/name/asyncGetPushOptionsFromServer:failure:">- asyncGetPushOptionsFromServer:failure:</option>
+		<option value="//api/name/initializeSDKWithOptions:">- initializeSDKWithOptions:</option>
 		
-		<option value="//api/name/asyncLoginWithUsername:password:success:failure:">- asyncLoginWithUsername:password:success:failure:</option>
+		<option value="//api/name/loginWithUsername:password:completion:">- loginWithUsername:password:completion:</option>
 		
-		<option value="//api/name/asyncLogout:success:failure:">- asyncLogout:success:failure:</option>
+		<option value="//api/name/logout:completion:">- logout:completion:</option>
 		
-		<option value="//api/name/asyncRegisterWithUsername:password:success:failure:">- asyncRegisterWithUsername:password:success:failure:</option>
+		<option value="//api/name/migrateDatabaseToLatestSDK">- migrateDatabaseToLatestSDK</option>
 		
-		<option value="//api/name/asyncSetApnsNickname:success:failure:">- asyncSetApnsNickname:success:failure:</option>
+		<option value="//api/name/registerForRemoteNotificationsWithDeviceToken:completion:">- registerForRemoteNotificationsWithDeviceToken:completion:</option>
 		
-		<option value="//api/name/asyncUpdatePushOptionsToServer:failure:">- asyncUpdatePushOptionsToServer:failure:</option>
+		<option value="//api/name/registerWithUsername:password:completion:">- registerWithUsername:password:completion:</option>
 		
-		<option value="//api/name/asyncUploadLogToServer:failure:">- asyncUploadLogToServer:failure:</option>
+		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
 		
-		<option value="//api/name/dataMigrationTo3">- dataMigrationTo3</option>
+		<option value="//api/name/updatePushNotifiationDisplayName:completion:">- updatePushNotifiationDisplayName:completion:</option>
 		
-		<option value="//api/name/initializeSDKWithOptions:">- initializeSDKWithOptions:</option>
+		<option value="//api/name/updatePushNotificationOptionsToServerWithCompletion:">- updatePushNotificationOptionsToServerWithCompletion:</option>
 		
-		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
+		<option value="//api/name/uploadDebugLogToServerWithCompletion:">- uploadDebugLogToServerWithCompletion:</option>
 		
 	</optgroup>
 	
@@ -231,7 +233,7 @@ <h3 class="method-title"><code><a href="#//api/name/currentUsername">&nbsp;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Current logined account</p>
+				<p>Current logged in user&rsquo;s username</p>
 			</div>
 			
 		    
@@ -248,7 +250,7 @@ <h3 class="method-title"><code><a href="#//api/name/currentUsername">&nbsp;&nbsp
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Current logined account</p>
+				<p>Current logged in user&rsquo;s username</p>
 			</div>
 			
 
@@ -323,7 +325,7 @@ <h3 class="method-title"><code><a href="#//api/name/pushOptions">&nbsp;&nbsp;pus
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Apple APNS setting</p>
+				<p>Apple Push Notification Service setting</p>
 			</div>
 			
 		    
@@ -340,7 +342,7 @@ <h3 class="method-title"><code><a href="#//api/name/pushOptions">&nbsp;&nbsp;pus
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Apple APNS setting</p>
+				<p>Apple Push Notification Service setting</p>
 			</div>
 			
 
@@ -369,7 +371,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatManager">&nbsp;&nbsp;cha
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Chat module</p>
+				<p>Chat Management</p>
 			</div>
 			
 		    
@@ -386,7 +388,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatManager">&nbsp;&nbsp;cha
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Chat module</p>
+				<p>Chat Management</p>
 			</div>
 			
 
@@ -415,7 +417,7 @@ <h3 class="method-title"><code><a href="#//api/name/contactManager">&nbsp;&nbsp;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Contact module</p>
+				<p>Contact Management</p>
 			</div>
 			
 		    
@@ -432,7 +434,7 @@ <h3 class="method-title"><code><a href="#//api/name/contactManager">&nbsp;&nbsp;
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Contact module</p>
+				<p>Contact Management</p>
 			</div>
 			
 
@@ -461,7 +463,7 @@ <h3 class="method-title"><code><a href="#//api/name/groupManager">&nbsp;&nbsp;gr
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group module</p>
+				<p>Group Management</p>
 			</div>
 			
 		    
@@ -478,7 +480,7 @@ <h3 class="method-title"><code><a href="#//api/name/groupManager">&nbsp;&nbsp;gr
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group module</p>
+				<p>Group Management</p>
 			</div>
 			
 
@@ -507,7 +509,7 @@ <h3 class="method-title"><code><a href="#//api/name/roomManager">&nbsp;&nbsp;roo
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Chatroom module</p>
+				<p>Chat room Management</p>
 			</div>
 			
 		    
@@ -524,7 +526,7 @@ <h3 class="method-title"><code><a href="#//api/name/roomManager">&nbsp;&nbsp;roo
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Chatroom module</p>
+				<p>Chat room Management</p>
 			</div>
 			
 
@@ -553,7 +555,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoLogin">&nbsp;&nbsp;isA
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether SDK will automatically login last logined account</p>
+				<p>If SDK will automatically log into with previously logged in session</p>
 			</div>
 			
 		    
@@ -570,7 +572,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoLogin">&nbsp;&nbsp;isA
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether SDK will automatically login last logined account</p>
+				<p>If SDK will automatically log into with previously logged in session</p>
 			</div>
 			
 
@@ -599,7 +601,7 @@ <h3 class="method-title"><code><a href="#//api/name/isLoggedIn">&nbsp;&nbsp;isLo
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether user has logged in</p>
+				<p>If a user logged in</p>
 			</div>
 			
 		    
@@ -616,7 +618,7 @@ <h3 class="method-title"><code><a href="#//api/name/isLoggedIn">&nbsp;&nbsp;isLo
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether user has logged in</p>
+				<p>If a user logged in</p>
 			</div>
 			
 
@@ -645,7 +647,7 @@ <h3 class="method-title"><code><a href="#//api/name/isConnected">&nbsp;&nbsp;isC
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether has connected to chat server</p>
+				<p>Connection status to Hyphenate IM server</p>
 			</div>
 			
 		    
@@ -662,7 +664,7 @@ <h3 class="method-title"><code><a href="#//api/name/isConnected">&nbsp;&nbsp;isC
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether has connected to chat server</p>
+				<p>Connection status to Hyphenate IM server</p>
 			</div>
 			
 
@@ -691,7 +693,7 @@ <h3 class="method-title"><code><a href="#//api/name/sharedClient">+&nbsp;sharedC
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get SDK single instance</p>
+				<p>Get SDK singleton instance</p>
 			</div>
 			
 		    
@@ -708,7 +710,7 @@ <h3 class="method-title"><code><a href="#//api/name/sharedClient">+&nbsp;sharedC
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get SDK single instance</p>
+				<p>Get SDK singleton instance</p>
 			</div>
 			
 
@@ -757,7 +759,65 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aQueue</code></th>
-						<td><p>The queue of call delegate method</p></td>
+						<td><p>The queue of calling delegate methods</p></td>
+					</tr>
+				
+				</table>
+			</div>
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>Add delegate</p>
+			</div>
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">EMClient.h</code></p>
+			</div>
+			
+			
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/addDelegate:" title="addDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addDelegate:">&ndash;&nbsp;addDelegate:</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+			
+			
+			<div class="method-subsection brief-description">
+				<p>Add delegate</p>
+			</div>
+			
+		    
+
+			<div class="method-subsection method-declaration"><code>- (void)addDelegate:(id&lt;EMClientDelegate&gt;)<em>aDelegate</em></code></div>
+
+		    
+			
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aDelegate</code></th>
+						<td><p>Delegate</p></td>
 					</tr>
 				
 				</table>
@@ -858,7 +918,7 @@ <h3 class="method-title"><code><a href="#//api/name/initializeSDKWithOptions:">&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialization sdk</p>
+				<p>Initialize the SDK</p>
 			</div>
 			
 		    
@@ -892,7 +952,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialization sdk</p>
+				<p>Initialize the SDK</p>
 			</div>
 			
 
@@ -910,8 +970,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncRegisterWithUsername:password:success:failure:" title="asyncRegisterWithUsername:password:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncRegisterWithUsername:password:success:failure:">&ndash;&nbsp;asyncRegisterWithUsername:password:success:failure:</a></code>
+	<a name="//api/name/registerWithUsername:password:completion:" title="registerWithUsername:password:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/registerWithUsername:password:completion:">&ndash;&nbsp;registerWithUsername:password:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -921,12 +981,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncRegisterWithUsername:pa
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Register a new user</p>
+				<p>Register a new IM user</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncRegisterWithUsername:(NSString *)<em>aUsername</em> password:(NSString *)<em>aPassword</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)registerWithUsername:(NSString *)<em>aUsername</em> password:(NSString *)<em>aPassword</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -945,13 +1005,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -965,9 +1020,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Register a new user</p>
+				<p>Register a new IM user</p>
 
-<p>It is not recommended, advise to register new user through REST API</p>
+<p>To enhance the reliability, registering new IM user through REST API from backend is highly recommended</p>
 			</div>
 			
 
@@ -985,8 +1040,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncLoginWithUsername:password:success:failure:" title="asyncLoginWithUsername:password:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncLoginWithUsername:password:success:failure:">&ndash;&nbsp;asyncLoginWithUsername:password:success:failure:</a></code>
+	<a name="//api/name/loginWithUsername:password:completion:" title="loginWithUsername:password:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/loginWithUsername:password:completion:">&ndash;&nbsp;loginWithUsername:password:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1001,7 +1056,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncLoginWithUsername:passw
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncLoginWithUsername:(NSString *)<em>aUsername</em> password:(NSString *)<em>aPassword</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)loginWithUsername:(NSString *)<em>aUsername</em> password:(NSString *)<em>aPassword</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1020,13 +1075,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1058,8 +1108,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncLogout:success:failure:" title="asyncLogout:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncLogout:success:failure:">&ndash;&nbsp;asyncLogout:success:failure:</a></code>
+	<a name="//api/name/logout:completion:" title="logout:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/logout:completion:">&ndash;&nbsp;logout:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1074,7 +1124,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncLogout:success:failure:
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncLogout:(BOOL)<em>aIsUnbindDeviceToken</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)logout:(BOOL)<em>aIsUnbindDeviceToken</em> completion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1084,7 +1134,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aIsUnbindDeviceToken</code></th>
-						<td><p>Whether unbind device token, device will don&rsquo;t receive message push after unbind token, if input YES, unbind failed will return error</p></td>
+						<td><p>Unbind device token to disable the Apple Push Notification Service</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1092,11 +1147,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Error</p>
-			</div>
-			
 
 			
 
@@ -1121,8 +1171,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncBindDeviceToken:success:failure:" title="asyncBindDeviceToken:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncBindDeviceToken:success:failure:">&ndash;&nbsp;asyncBindDeviceToken:success:failure:</a></code>
+	<a name="//api/name/registerForRemoteNotificationsWithDeviceToken:completion:" title="registerForRemoteNotificationsWithDeviceToken:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/registerForRemoteNotificationsWithDeviceToken:completion:">&ndash;&nbsp;registerForRemoteNotificationsWithDeviceToken:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1132,12 +1182,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncBindDeviceToken:success
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Bind device token</p>
+				<p>Device token binding is required to enable Apple push notification service</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncBindDeviceToken:(NSData *)<em>aDeviceToken</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)registerForRemoteNotificationsWithDeviceToken:(NSData *)<em>aDeviceToken</em> completion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1151,13 +1201,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1171,7 +1216,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Bind device token</p>
+				<p>Device token binding is required to enable Apple push notification service</p>
 			</div>
 			
 
@@ -1189,8 +1234,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncSetApnsNickname:success:failure:" title="asyncSetApnsNickname:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncSetApnsNickname:success:failure:">&ndash;&nbsp;asyncSetApnsNickname:success:failure:</a></code>
+	<a name="//api/name/updatePushNotifiationDisplayName:completion:" title="updatePushNotifiationDisplayName:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updatePushNotifiationDisplayName:completion:">&ndash;&nbsp;updatePushNotifiationDisplayName:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1200,12 +1245,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncSetApnsNickname:success
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Set nick name to show in push message</p>
+				<p>Set display name for the push notification</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncSetApnsNickname:(NSString *)<em>aNickname</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updatePushNotifiationDisplayName:(NSString *)<em>aDisplayName</em> completion:(void ( ^ ) ( NSString *aDisplayName , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1214,18 +1259,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aNickname</code></th>
-						<td><p>Nickname</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<th scope="row" class="argument-name"><code>aDisplayName</code></th>
+						<td><p>Display name of push</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1239,7 +1279,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Set nick name to show in push message</p>
+				<p>Set display name for the push notification</p>
 			</div>
 			
 
@@ -1257,8 +1297,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncGetPushOptionsFromServer:failure:" title="asyncGetPushOptionsFromServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncGetPushOptionsFromServer:failure:">&ndash;&nbsp;asyncGetPushOptionsFromServer:failure:</a></code>
+	<a name="//api/name/getPushNotificationOptionsFromServerWithCompletion:" title="getPushNotificationOptionsFromServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getPushNotificationOptionsFromServerWithCompletion:">&ndash;&nbsp;getPushNotificationOptionsFromServerWithCompletion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1268,12 +1308,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncGetPushOptionsFromServe
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get apns <a href="#//api/name/options">options</a> from the server</p>
+				<p>Get Apple Push Notification Service <a href="#//api/name/options">options</a> from the server</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncGetPushOptionsFromServer:(void ( ^ ) ( EMPushOptions *aOptions ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getPushNotificationOptionsFromServerWithCompletion:(void ( ^ ) ( EMPushOptions *aOptions , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1282,13 +1322,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1302,7 +1337,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get apns <a href="#//api/name/options">options</a> from the server</p>
+				<p>Get Apple Push Notification Service <a href="#//api/name/options">options</a> from the server</p>
 			</div>
 			
 
@@ -1320,8 +1355,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncUpdatePushOptionsToServer:failure:" title="asyncUpdatePushOptionsToServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncUpdatePushOptionsToServer:failure:">&ndash;&nbsp;asyncUpdatePushOptionsToServer:failure:</a></code>
+	<a name="//api/name/updatePushNotificationOptionsToServerWithCompletion:" title="updatePushNotificationOptionsToServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updatePushNotificationOptionsToServerWithCompletion:">&ndash;&nbsp;updatePushNotificationOptionsToServerWithCompletion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1331,12 +1366,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncUpdatePushOptionsToServ
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Update APNS <a href="#//api/name/options">options</a> to the server</p>
+				<p>Update Apple Push Notification Service <a href="#//api/name/options">options</a> to the server</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncUpdatePushOptionsToServer:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updatePushNotificationOptionsToServerWithCompletion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1345,13 +1380,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1365,7 +1395,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Update APNS <a href="#//api/name/options">options</a> to the server</p>
+				<p>Update Apple Push Notification Service <a href="#//api/name/options">options</a> to the server</p>
 			</div>
 			
 
@@ -1383,8 +1413,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncUploadLogToServer:failure:" title="asyncUploadLogToServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncUploadLogToServer:failure:">&ndash;&nbsp;asyncUploadLogToServer:failure:</a></code>
+	<a name="//api/name/uploadDebugLogToServerWithCompletion:" title="uploadDebugLogToServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/uploadDebugLogToServerWithCompletion:">&ndash;&nbsp;uploadDebugLogToServerWithCompletion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1399,7 +1429,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncUploadLogToServer:failu
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncUploadLogToServer:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)uploadDebugLogToServerWithCompletion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1408,13 +1438,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1446,8 +1471,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/dataMigrationTo3" title="dataMigrationTo3"></a>
-	<h3 class="method-title"><code><a href="#//api/name/dataMigrationTo3">&ndash;&nbsp;dataMigrationTo3</a></code>
+	<a name="//api/name/migrateDatabaseToLatestSDK" title="migrateDatabaseToLatestSDK"></a>
+	<h3 class="method-title"><code><a href="#//api/name/migrateDatabaseToLatestSDK">&ndash;&nbsp;migrateDatabaseToLatestSDK</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1457,12 +1482,12 @@ <h3 class="method-title"><code><a href="#//api/name/dataMigrationTo3">&ndash;&nb
 			
 			
 			<div class="method-subsection brief-description">
-				<p>iOS-specific, data migration to SDK3.0</p>
+				<p>Migrate the IM database to the latest SDK <a href="#//api/name/version">version</a></p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)dataMigrationTo3</code></div>
+			<div class="method-subsection method-declaration"><code>- (BOOL)migrateDatabaseToLatestSDK</code></div>
 
 		    
 			
@@ -1470,7 +1495,7 @@ <h3 class="method-title"><code><a href="#//api/name/dataMigrationTo3">&ndash;&nb
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Whether migration successful</p>
+				<p>Return YES for success</p>
 			</div>
 			
 
@@ -1479,11 +1504,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>iOS-specific, data migration to SDK3.0</p>
-
-<p>Synchronization method will block the current thread</p>
-
-<p>It&rsquo;s needed to call this method when update to SDK3.0, developers need to wait this method complete before DB related operations</p>
+				<p>Migrate the IM database to the latest SDK <a href="#//api/name/version">version</a></p>
 			</div>
 			
 
@@ -1512,7 +1533,7 @@ <h3 class="method-title"><code><a href="#//api/name/applicationDidEnterBackgroun
 			
 			
 			<div class="method-subsection brief-description">
-				<p>iOS only, should call this method to disconnect from server when app enter backgroup</p>
+				<p>Disconnect from server when app enters background</p>
 			</div>
 			
 		    
@@ -1541,7 +1562,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>iOS only, should call this method to disconnect from server when app enter backgroup</p>
+				<p>Disconnect from server when app enters background</p>
 			</div>
 			
 
@@ -1570,7 +1591,7 @@ <h3 class="method-title"><code><a href="#//api/name/applicationWillEnterForegrou
 			
 			
 			<div class="method-subsection brief-description">
-				<p>iOS only, should call this method to re-connect to server when app restore to foreground</p>
+				<p>Re-connect to server when app enters foreground</p>
 			</div>
 			
 		    
@@ -1599,7 +1620,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>iOS only, should call this method to re-connect to server when app restore to foreground</p>
+				<p>Re-connect to server when app enters foreground</p>
 			</div>
 			
 
@@ -1685,7 +1706,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMCmdMessageBody.html b/HyphenateSDK/doc/Classes/EMCmdMessageBody.html
index 43e976f..39f5281 100644
--- a/HyphenateSDK/doc/Classes/EMCmdMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMCmdMessageBody.html
@@ -177,7 +177,7 @@ <h3 class="method-title"><code><a href="#//api/name/params">&nbsp;&nbsp;params</
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Command parameters, only for compatable with old version, use EMMessage&rsquo;s extend attribute instead</p>
+				<p>Command parameters, only compatable with old sdk versions. For SDK version 3.0+, use EMMessage&rsquo;s ext property instead</p>
 			</div>
 			
 		    
@@ -194,7 +194,7 @@ <h3 class="method-title"><code><a href="#//api/name/params">&nbsp;&nbsp;params</
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Command parameters, only for compatable with old version, use EMMessage&rsquo;s extend attribute instead</p>
+				<p>Command parameters, only compatable with old sdk versions. For SDK version 3.0+, use EMMessage&rsquo;s ext property instead</p>
 			</div>
 			
 
@@ -223,7 +223,7 @@ <h3 class="method-title"><code><a href="#//api/name/initWithAction:">&ndash;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize command message body</p>
+				<p>Construct command message body</p>
 			</div>
 			
 		    
@@ -257,7 +257,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize command message body</p>
+				<p>Construct command message body</p>
 			</div>
 			
 
@@ -289,7 +289,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMConversation.html b/HyphenateSDK/doc/Classes/EMConversation.html
index f1facce..8005254 100644
--- a/HyphenateSDK/doc/Classes/EMConversation.html
+++ b/HyphenateSDK/doc/Classes/EMConversation.html
@@ -74,31 +74,31 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/deleteAllMessages">- deleteAllMessages</option>
+		<option value="//api/name/appendMessage:error:">- appendMessage:error:</option>
 		
-		<option value="//api/name/deleteMessageWithId:">- deleteMessageWithId:</option>
+		<option value="//api/name/deleteAllMessages:">- deleteAllMessages:</option>
 		
-		<option value="//api/name/insertMessage:">- insertMessage:</option>
+		<option value="//api/name/deleteMessageWithId:error:">- deleteMessageWithId:error:</option>
 		
-		<option value="//api/name/latestMessageFromOthers">- latestMessageFromOthers</option>
+		<option value="//api/name/insertMessage:error:">- insertMessage:error:</option>
 		
-		<option value="//api/name/loadMessageWithId:">- loadMessageWithId:</option>
+		<option value="//api/name/lastReceivedMessage">- lastReceivedMessage</option>
 		
-		<option value="//api/name/loadMoreMessagesContain:before:limit:from:direction:">- loadMoreMessagesContain:before:limit:from:direction:</option>
+		<option value="//api/name/loadMessageWithId:error:">- loadMessageWithId:error:</option>
 		
-		<option value="//api/name/loadMoreMessagesFrom:to:maxCount:">- loadMoreMessagesFrom:to:maxCount:</option>
+		<option value="//api/name/loadMessagesFrom:to:count:completion:">- loadMessagesFrom:to:count:completion:</option>
 		
-		<option value="//api/name/loadMoreMessagesFromId:limit:direction:">- loadMoreMessagesFromId:limit:direction:</option>
+		<option value="//api/name/loadMessagesStartFromId:count:searchDirection:completion:">- loadMessagesStartFromId:count:searchDirection:completion:</option>
 		
-		<option value="//api/name/loadMoreMessagesWithType:before:limit:from:direction:">- loadMoreMessagesWithType:before:limit:from:direction:</option>
+		<option value="//api/name/loadMessagesWithKeyword:timestamp:count:fromUser:searchDirection:completion:">- loadMessagesWithKeyword:timestamp:count:fromUser:searchDirection:completion:</option>
 		
-		<option value="//api/name/markAllMessagesAsRead">- markAllMessagesAsRead</option>
+		<option value="//api/name/loadMessagesWithType:timestamp:count:fromUser:searchDirection:completion:">- loadMessagesWithType:timestamp:count:fromUser:searchDirection:completion:</option>
 		
-		<option value="//api/name/markMessageAsReadWithId:">- markMessageAsReadWithId:</option>
+		<option value="//api/name/markAllMessagesAsRead:">- markAllMessagesAsRead:</option>
 		
-		<option value="//api/name/updateConversationExtToDB">- updateConversationExtToDB</option>
+		<option value="//api/name/markMessageAsReadWithId:error:">- markMessageAsReadWithId:error:</option>
 		
-		<option value="//api/name/updateMessage:">- updateMessage:</option>
+		<option value="//api/name/updateMessageChange:error:">- updateMessageChange:error:</option>
 		
 	</optgroup>
 	
@@ -299,7 +299,7 @@ <h3 class="method-title"><code><a href="#//api/name/ext">&nbsp;&nbsp;ext</a></co
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Conversation extend property</p>
+				<p>Conversation extension property</p>
 			</div>
 			
 		    
@@ -316,7 +316,7 @@ <h3 class="method-title"><code><a href="#//api/name/ext">&nbsp;&nbsp;ext</a></co
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Conversation extend property</p>
+				<p>Conversation extension property</p>
 			</div>
 			
 
@@ -380,8 +380,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/insertMessage:" title="insertMessage:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/insertMessage:">&ndash;&nbsp;insertMessage:</a></code>
+	<a name="//api/name/insertMessage:error:" title="insertMessage:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/insertMessage:error:">&ndash;&nbsp;insertMessage:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -391,12 +391,12 @@ <h3 class="method-title"><code><a href="#//api/name/insertMessage:">&ndash;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Insert a message to conversation, message&rsquo;s <a href="#//api/name/conversationId">conversationId</a> should equle to conversation&rsquo;s <a href="#//api/name/conversationId">conversationId</a>, message will be inserted to DB, and update conversation&rsquo;s property</p>
+				<p>Insert a message to a conversation. ConversationId of the message should be the same as <a href="#//api/name/conversationId">conversationId</a> of the conversation in order to insert the message into the conversation correctly.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)insertMessage:(EMMessage *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)insertMessage:(EMMessage *)<em>aMessage</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -409,23 +409,23 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 						<td><p>Message</p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message insert result, YES: success, No: fail</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Insert a message to conversation, message&rsquo;s <a href="#//api/name/conversationId">conversationId</a> should equle to conversation&rsquo;s <a href="#//api/name/conversationId">conversationId</a>, message will be inserted to DB, and update conversation&rsquo;s property</p>
+				<p>Insert a message to a conversation. ConversationId of the message should be the same as <a href="#//api/name/conversationId">conversationId</a> of the conversation in order to insert the message into the conversation correctly.</p>
 			</div>
 			
 
@@ -443,8 +443,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/deleteMessageWithId:" title="deleteMessageWithId:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/deleteMessageWithId:">&ndash;&nbsp;deleteMessageWithId:</a></code>
+	<a name="//api/name/appendMessage:error:" title="appendMessage:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/appendMessage:error:">&ndash;&nbsp;appendMessage:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -454,12 +454,12 @@ <h3 class="method-title"><code><a href="#//api/name/deleteMessageWithId:">&ndash
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Delete a message</p>
+				<p>Insert a message to the end of a conversation. ConversationId of the message should be the same as <a href="#//api/name/conversationId">conversationId</a> of the conversation in order to insert the message into the conversation correctly.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)deleteMessageWithId:(NSString *)<em>aMessageId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)appendMessage:(EMMessage *)<em>aMessage</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -468,8 +468,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aMessageId</code></th>
-						<td><p>Message&rsquo;s ID who will be deleted</p></td>
+						<th scope="row" class="argument-name"><code>aMessage</code></th>
+						<td><p>Message</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
 					</tr>
 				
 				</table>
@@ -477,18 +482,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message delete result, YES: success, No: fail</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Delete a message</p>
+				<p>Insert a message to the end of a conversation. ConversationId of the message should be the same as <a href="#//api/name/conversationId">conversationId</a> of the conversation in order to insert the message into the conversation correctly.</p>
 			</div>
 			
 
@@ -506,8 +506,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/deleteAllMessages" title="deleteAllMessages"></a>
-	<h3 class="method-title"><code><a href="#//api/name/deleteAllMessages">&ndash;&nbsp;deleteAllMessages</a></code>
+	<a name="//api/name/deleteMessageWithId:error:" title="deleteMessageWithId:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/deleteMessageWithId:error:">&ndash;&nbsp;deleteMessageWithId:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -517,29 +517,41 @@ <h3 class="method-title"><code><a href="#//api/name/deleteAllMessages">&ndash;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Delete all message of the conversation</p>
+				<p>Delete a message</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)deleteAllMessages</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)deleteMessageWithId:(NSString *)<em>aMessageId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Delete result, YES: success, No: fail</p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aMessageId</code></th>
+						<td><p>MessageId of the message to be deleted</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Delete all message of the conversation</p>
+				<p>Delete a message</p>
 			</div>
 			
 
@@ -557,8 +569,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/updateMessage:" title="updateMessage:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/updateMessage:">&ndash;&nbsp;updateMessage:</a></code>
+	<a name="//api/name/deleteAllMessages:" title="deleteAllMessages:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/deleteAllMessages:">&ndash;&nbsp;deleteAllMessages:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -568,12 +580,12 @@ <h3 class="method-title"><code><a href="#//api/name/updateMessage:">&ndash;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Update a message, can&rsquo;t update message&rsquo;s messageId, conversation&rsquo;s <a href="#//api/name/latestMessage">latestMessage</a> and so on properties will update after update the message</p>
+				<p>Delete all message of a conversation</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)updateMessage:(EMMessage *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)deleteAllMessages:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -582,8 +594,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aMessage</code></th>
-						<td><p>Message</p></td>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
 					</tr>
 				
 				</table>
@@ -591,18 +603,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message update result, YES: success, No: fail</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Update a message, can&rsquo;t update message&rsquo;s messageId, conversation&rsquo;s <a href="#//api/name/latestMessage">latestMessage</a> and so on properties will update after update the message</p>
+				<p>Delete all message of a conversation</p>
 			</div>
 			
 
@@ -620,8 +627,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/markMessageAsReadWithId:" title="markMessageAsReadWithId:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/markMessageAsReadWithId:">&ndash;&nbsp;markMessageAsReadWithId:</a></code>
+	<a name="//api/name/updateMessageChange:error:" title="updateMessageChange:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updateMessageChange:error:">&ndash;&nbsp;updateMessageChange:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -631,12 +638,12 @@ <h3 class="method-title"><code><a href="#//api/name/markMessageAsReadWithId:">&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Mark a message as read</p>
+				<p>Update a local message, conversation&rsquo;s <a href="#//api/name/latestMessage">latestMessage</a> and other properties will be updated accordingly. Please note that messageId can not be updated.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)markMessageAsReadWithId:(NSString *)<em>aMessageId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updateMessageChange:(EMMessage *)<em>aMessage</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -645,8 +652,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aMessageId</code></th>
-						<td><p>Message&rsquo;s ID who will be set read status</p></td>
+						<th scope="row" class="argument-name"><code>aMessage</code></th>
+						<td><p>Message</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
 					</tr>
 				
 				</table>
@@ -654,18 +666,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Result of mark message as read, YES: success, No: fail</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Mark a message as read</p>
+				<p>Update a local message, conversation&rsquo;s <a href="#//api/name/latestMessage">latestMessage</a> and other properties will be updated accordingly. Please note that messageId can not be updated.</p>
 			</div>
 			
 
@@ -683,8 +690,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/markAllMessagesAsRead" title="markAllMessagesAsRead"></a>
-	<h3 class="method-title"><code><a href="#//api/name/markAllMessagesAsRead">&ndash;&nbsp;markAllMessagesAsRead</a></code>
+	<a name="//api/name/markMessageAsReadWithId:error:" title="markMessageAsReadWithId:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/markMessageAsReadWithId:error:">&ndash;&nbsp;markMessageAsReadWithId:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -694,29 +701,41 @@ <h3 class="method-title"><code><a href="#//api/name/markAllMessagesAsRead">&ndas
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Mark all message as read</p>
+				<p>Mark a message as read</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)markAllMessagesAsRead</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)markMessageAsReadWithId:(NSString *)<em>aMessageId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Result of mark all message as read, YES: success, No: fail</p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aMessageId</code></th>
+						<td><p>MessageID</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Mark all message as read</p>
+				<p>Mark a message as read</p>
 			</div>
 			
 
@@ -734,8 +753,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/updateConversationExtToDB" title="updateConversationExtToDB"></a>
-	<h3 class="method-title"><code><a href="#//api/name/updateConversationExtToDB">&ndash;&nbsp;updateConversationExtToDB</a></code>
+	<a name="//api/name/markAllMessagesAsRead:" title="markAllMessagesAsRead:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/markAllMessagesAsRead:">&ndash;&nbsp;markAllMessagesAsRead:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -745,29 +764,36 @@ <h3 class="method-title"><code><a href="#//api/name/updateConversationExtToDB">&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Update conversation extend properties to DB</p>
+				<p>Mark all message as read</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)updateConversationExtToDB</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)markAllMessagesAsRead:(EMError **)<em>pError</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Extend properties update result, YES: success, No: fail</p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Update conversation extend properties to DB</p>
+				<p>Mark all message as read</p>
 			</div>
 			
 
@@ -785,8 +811,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadMessageWithId:" title="loadMessageWithId:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadMessageWithId:">&ndash;&nbsp;loadMessageWithId:</a></code>
+	<a name="//api/name/loadMessageWithId:error:" title="loadMessageWithId:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/loadMessageWithId:error:">&ndash;&nbsp;loadMessageWithId:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -801,7 +827,7 @@ <h3 class="method-title"><code><a href="#//api/name/loadMessageWithId:">&ndash;&
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (EMMessage *)loadMessageWithId:(NSString *)<em>aMessageId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (EMMessage *)loadMessageWithId:(NSString *)<em>aMessageId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -811,7 +837,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessageId</code></th>
-						<td><p>Message&rsquo;s id</p></td>
+						<td><p>MessageID</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
 					</tr>
 				
 				</table>
@@ -819,11 +850,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message instance</p>
-			</div>
-			
 
 			
 
@@ -848,8 +874,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadMoreMessagesFromId:limit:direction:" title="loadMoreMessagesFromId:limit:direction:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesFromId:limit:direction:">&ndash;&nbsp;loadMoreMessagesFromId:limit:direction:</a></code>
+	<a name="//api/name/lastReceivedMessage" title="lastReceivedMessage"></a>
+	<h3 class="method-title"><code><a href="#//api/name/lastReceivedMessage">&ndash;&nbsp;lastReceivedMessage</a></code>
 </h3>
 
 	<div class="method-info">
@@ -859,42 +885,20 @@ <h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesFromId:limit
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get more messages from DB, result messages are sorted by receive time, and NOT include the reference message, if reference messag&rsquo;s ID is nil, will fetch message from latest message</p>
+				<p>Get last received message</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)loadMoreMessagesFromId:(NSString *)<em>aMessageId</em> limit:(int)<em>aLimit</em> direction:(EMMessageSearchDirection)<em>aDirection</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (EMMessage *)lastReceivedMessage</code></div>
 
 		    
 			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aMessageId</code></th>
-						<td><p>Reference message&rsquo;s ID</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aLimit</code></th>
-						<td><p>Count of messages to load</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aDirection</code></th>
-						<td><p>Message search direction</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
 
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message list<a href="../Classes/EMMessage.html">EMMessage</a></p>
+				<p>Message instance</p>
 			</div>
 			
 
@@ -903,7 +907,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get more messages from DB, result messages are sorted by receive time, and NOT include the reference message, if reference messag&rsquo;s ID is nil, will fetch message from latest message</p>
+				<p>Get last received message</p>
 			</div>
 			
 
@@ -921,8 +925,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadMoreMessagesWithType:before:limit:from:direction:" title="loadMoreMessagesWithType:before:limit:from:direction:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesWithType:before:limit:from:direction:">&ndash;&nbsp;loadMoreMessagesWithType:before:limit:from:direction:</a></code>
+	<a name="//api/name/loadMessagesStartFromId:count:searchDirection:completion:" title="loadMessagesStartFromId:count:searchDirection:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/loadMessagesStartFromId:count:searchDirection:completion:">&ndash;&nbsp;loadMessagesStartFromId:count:searchDirection:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -932,12 +936,12 @@ <h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesWithType:bef
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get more messages with specified <a href="#//api/name/type">type</a> from DB, result messages are sorted by received time, if reference timestamp is negative, will fetch message from latest message, andd will fetch all messages that meet the condition if aLimit is negative</p>
+				<p>Load messages from a specified message, returning messages are sorted by receiving timestamp. If the aMessageId is nil, return the latest received messages.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)loadMoreMessagesWithType:(EMMessageBodyType)<em>aType</em> before:(long long)<em>aTimestamp</em> limit:(int)<em>aLimit</em> from:(NSString *)<em>aSender</em> direction:(EMMessageSearchDirection)<em>aDirection</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)loadMessagesStartFromId:(NSString *)<em>aMessageId</em> count:(int)<em>aCount</em> searchDirection:(EMMessageSearchDirection)<em>aDirection</em> completion:(void ( ^ ) ( NSArray *aMessages , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -946,28 +950,23 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aType</code></th>
-						<td><p>Message <a href="#//api/name/type">type</a> to load</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aTimestamp</code></th>
-						<td><p>Reference timestamp</p></td>
+						<th scope="row" class="argument-name"><code>aMessageId</code></th>
+						<td><p>Reference message&rsquo;s ID</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aLimit</code></th>
+						<th scope="row" class="argument-name"><code>aCount</code></th>
 						<td><p>Count of messages to load</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSender</code></th>
-						<td><p>Message sender, will ignore it if it&rsquo;s empty</p></td>
+						<th scope="row" class="argument-name"><code>aDirection</code></th>
+						<td><p>Message search direction</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aDirection</code></th>
-						<td><p>Message search direction</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -975,18 +974,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message list<a href="../Classes/EMMessage.html">EMMessage</a></p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get more messages with specified <a href="#//api/name/type">type</a> from DB, result messages are sorted by received time, if reference timestamp is negative, will fetch message from latest message, andd will fetch all messages that meet the condition if aLimit is negative</p>
+				<p>Load messages from a specified message, returning messages are sorted by receiving timestamp. If the aMessageId is nil, return the latest received messages.</p>
 			</div>
 			
 
@@ -1004,8 +998,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadMoreMessagesContain:before:limit:from:direction:" title="loadMoreMessagesContain:before:limit:from:direction:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesContain:before:limit:from:direction:">&ndash;&nbsp;loadMoreMessagesContain:before:limit:from:direction:</a></code>
+	<a name="//api/name/loadMessagesWithType:timestamp:count:fromUser:searchDirection:completion:" title="loadMessagesWithType:timestamp:count:fromUser:searchDirection:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/loadMessagesWithType:timestamp:count:fromUser:searchDirection:completion:">&ndash;&nbsp;loadMessagesWithType:timestamp:count:fromUser:searchDirection:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1015,12 +1009,12 @@ <h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesContain:befo
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get more messages contain specified keywords from DB, result messages are sorted by received time, if reference timestamp is negative, will fetch message from latest message, andd will fetch all messages that meet the condition if aLimit is negative</p>
+				<p>Load messages with specified <a href="#//api/name/type">type</a>, returning messages are sorted by receiving timestamp. If reference timestamp is negative, load from the latest messages; if message count is negative, load all messages that meet the condition.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)loadMoreMessagesContain:(NSString *)<em>aKeywords</em> before:(long long)<em>aTimestamp</em> limit:(int)<em>aLimit</em> from:(NSString *)<em>aSender</em> direction:(EMMessageSearchDirection)<em>aDirection</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)loadMessagesWithType:(EMMessageBodyType)<em>aType</em> timestamp:(long long)<em>aTimestamp</em> count:(int)<em>aCount</em> fromUser:(NSString *)<em>aUsername</em> searchDirection:(EMMessageSearchDirection)<em>aDirection</em> completion:(void ( ^ ) ( NSArray *aMessages , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1029,8 +1023,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aKeywords</code></th>
-						<td><p>Search content, will ignore it if it&rsquo;s empty</p></td>
+						<th scope="row" class="argument-name"><code>aType</code></th>
+						<td><p>Message <a href="#//api/name/type">type</a> to load</p></td>
 					</tr>
 				
 					<tr>
@@ -1039,18 +1033,23 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aLimit</code></th>
-						<td><p>Count of messages to load</p></td>
+						<th scope="row" class="argument-name"><code>aUsername</code></th>
+						<td><p>Message sender (optional)</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSender</code></th>
-						<td><p>Message sender, will ignore it if it&rsquo;s empty</p></td>
+						<th scope="row" class="argument-name"><code>aDirection</code></th>
+						<td><p>Message search direction</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aDirection</code></th>
-						<td><p>Message search direction</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aLimit</code></th>
+						<td><p>Count of messages to load</p></td>
 					</tr>
 				
 				</table>
@@ -1058,18 +1057,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message list<a href="../Classes/EMMessage.html">EMMessage</a></p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get more messages contain specified keywords from DB, result messages are sorted by received time, if reference timestamp is negative, will fetch message from latest message, andd will fetch all messages that meet the condition if aLimit is negative</p>
+				<p>Load messages with specified <a href="#//api/name/type">type</a>, returning messages are sorted by receiving timestamp. If reference timestamp is negative, load from the latest messages; if message count is negative, load all messages that meet the condition.</p>
 			</div>
 			
 
@@ -1087,8 +1081,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadMoreMessagesFrom:to:maxCount:" title="loadMoreMessagesFrom:to:maxCount:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesFrom:to:maxCount:">&ndash;&nbsp;loadMoreMessagesFrom:to:maxCount:</a></code>
+	<a name="//api/name/loadMessagesWithKeyword:timestamp:count:fromUser:searchDirection:completion:" title="loadMessagesWithKeyword:timestamp:count:fromUser:searchDirection:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/loadMessagesWithKeyword:timestamp:count:fromUser:searchDirection:completion:">&ndash;&nbsp;loadMessagesWithKeyword:timestamp:count:fromUser:searchDirection:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1098,12 +1092,12 @@ <h3 class="method-title"><code><a href="#//api/name/loadMoreMessagesFrom:to:maxC
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Load messages from DB in duration, result messages are sorted by receive time, user should limit the max count to load to avoid memory issue</p>
+				<p>Load messages with specified keyword, returning messages are sorted by receiving timestamp. If reference timestamp is negative, load from the latest messages; if message count is negative, load all messages that meet the condition.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)loadMoreMessagesFrom:(long long)<em>aStartTimestamp</em> to:(long long)<em>aEndTimestamp</em> maxCount:(int)<em>aMaxCount</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)loadMessagesWithKeyword:(NSString *)<em>aKeyword</em> timestamp:(long long)<em>aTimestamp</em> count:(int)<em>aCount</em> fromUser:(NSString *)<em>aSender</em> searchDirection:(EMMessageSearchDirection)<em>aDirection</em> completion:(void ( ^ ) ( NSArray *aMessages , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1112,37 +1106,47 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aStartTimestamp</code></th>
-						<td><p>Start time&rsquo;s timestamp in miliseconds</p></td>
+						<th scope="row" class="argument-name"><code>aTimestamp</code></th>
+						<td><p>Reference timestamp</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aEndTimestamp</code></th>
-						<td><p>End time&rsquo;s timestamp in miliseconds</p></td>
+						<th scope="row" class="argument-name"><code>aCount</code></th>
+						<td><p>Count of messages to load</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aMaxCount</code></th>
+						<th scope="row" class="argument-name"><code>aSender</code></th>
+						<td><p>Message sender (optional)</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aDirection</code></th>
 						<td><p>Message search direction</p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aKeywords</code></th>
+						<td><p>Search content, will ignore it if it&rsquo;s empty</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message list<a href="../Classes/EMMessage.html">EMMessage</a></p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Load messages from DB in duration, result messages are sorted by receive time, user should limit the max count to load to avoid memory issue</p>
+				<p>Load messages with specified keyword, returning messages are sorted by receiving timestamp. If reference timestamp is negative, load from the latest messages; if message count is negative, load all messages that meet the condition.</p>
 			</div>
 			
 
@@ -1160,8 +1164,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/latestMessageFromOthers" title="latestMessageFromOthers"></a>
-	<h3 class="method-title"><code><a href="#//api/name/latestMessageFromOthers">&ndash;&nbsp;latestMessageFromOthers</a></code>
+	<a name="//api/name/loadMessagesFrom:to:count:completion:" title="loadMessagesFrom:to:count:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/loadMessagesFrom:to:count:completion:">&ndash;&nbsp;loadMessagesFrom:to:count:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -1171,29 +1175,51 @@ <h3 class="method-title"><code><a href="#//api/name/latestMessageFromOthers">&nd
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get latest message that received from others</p>
+				<p>Load messages within specified time range, retruning messages are sorted by receiving timestamp</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (EMMessage *)latestMessageFromOthers</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)loadMessagesFrom:(long long)<em>aStartTimestamp</em> to:(long long)<em>aEndTimestamp</em> count:(int)<em>aCount</em> completion:(void ( ^ ) ( NSArray *aMessages , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Message instance</p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aStartTimestamp</code></th>
+						<td><p>Start time&rsquo;s timestamp in miliseconds</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aEndTimestamp</code></th>
+						<td><p>End time&rsquo;s timestamp in miliseconds</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCount</code></th>
+						<td><p>Message search direction</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get latest message that received from others</p>
+				<p>Load messages within specified time range, retruning messages are sorted by receiving timestamp</p>
 			</div>
 			
 
@@ -1225,7 +1251,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMCursorResult.html b/HyphenateSDK/doc/Classes/EMCursorResult.html
index 8738dbc..ed9c898 100644
--- a/HyphenateSDK/doc/Classes/EMCursorResult.html
+++ b/HyphenateSDK/doc/Classes/EMCursorResult.html
@@ -253,7 +253,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Instance of <a href="#//api/name/cursor">cursor</a> result</p>
+				<p>An instance of <a href="#//api/name/cursor">cursor</a> result</p>
 			</div>
 			
 
@@ -294,7 +294,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMError.html b/HyphenateSDK/doc/Classes/EMError.html
index 384859d..f49d06e 100644
--- a/HyphenateSDK/doc/Classes/EMError.html
+++ b/HyphenateSDK/doc/Classes/EMError.html
@@ -188,7 +188,7 @@ <h3 class="method-title"><code><a href="#//api/name/errorDescription">&nbsp;&nbs
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) NSString *errorDescription</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *errorDescription</code></div>
 
 		    
 			
@@ -229,7 +229,7 @@ <h3 class="method-title"><code><a href="#//api/name/initWithDescription:code:">&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize a error instance</p>
+				<p>Initialize an error instance</p>
 			</div>
 			
 		    
@@ -268,7 +268,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize a error instance</p>
+				<p>Initialize an error instance</p>
 			</div>
 			
 
@@ -368,7 +368,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMFileMessageBody.html b/HyphenateSDK/doc/Classes/EMFileMessageBody.html
index ce9a2e9..774b2c7 100644
--- a/HyphenateSDK/doc/Classes/EMFileMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMFileMessageBody.html
@@ -279,7 +279,7 @@ <h3 class="method-title"><code><a href="#//api/name/secretKey">&nbsp;&nbsp;secre
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Secret key of attachment, need verify secret key when download attachment</p>
+				<p>Secret key for downloading the message attachment</p>
 			</div>
 			
 		    
@@ -296,7 +296,7 @@ <h3 class="method-title"><code><a href="#//api/name/secretKey">&nbsp;&nbsp;secre
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Secret key of attachment, need verify secret key when download attachment</p>
+				<p>Secret key for downloading the message attachment</p>
 			</div>
 			
 
@@ -437,7 +437,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aDisplayName</code></th>
-						<td><p>Display name of the attachment (NOT include file path)</p></td>
+						<td><p>Display name of the attachment</p></td>
 					</tr>
 				
 				</table>
@@ -505,7 +505,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aDisplayName</code></th>
-						<td><p>Display name of the attachment (NOT include file path)</p></td>
+						<td><p>Display name of the attachment</p></td>
 					</tr>
 				
 				</table>
@@ -556,7 +556,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMGroup.html b/HyphenateSDK/doc/Classes/EMGroup.html
index 5843f10..0be693a 100644
--- a/HyphenateSDK/doc/Classes/EMGroup.html
+++ b/HyphenateSDK/doc/Classes/EMGroup.html
@@ -56,7 +56,7 @@ <h1 id="library-title">
 	
 	<optgroup label="Properties">
 		
-		<option value="//api/name/bans">bans</option>
+		<option value="//api/name/)">)</option>
 		
 		<option value="//api/name/description">description</option>
 		
@@ -72,8 +72,6 @@ <h1 id="library-title">
 		
 		<option value="//api/name/occupants">occupants</option>
 		
-		<option value="//api/name/occupantsCount">occupantsCount</option>
-		
 		<option value="//api/name/owner">owner</option>
 		
 		<option value="//api/name/setting">setting</option>
@@ -203,7 +201,7 @@ <h3 class="method-title"><code><a href="#//api/name/subject">&nbsp;&nbsp;subject
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group&rsquo;s subject, need to fetch group&rsquo;s specification</p>
+				<p>Subject of the group</p>
 			</div>
 			
 		    
@@ -220,7 +218,7 @@ <h3 class="method-title"><code><a href="#//api/name/subject">&nbsp;&nbsp;subject
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group&rsquo;s subject, need to fetch group&rsquo;s specification</p>
+				<p>Subject of the group</p>
 			</div>
 			
 
@@ -249,7 +247,7 @@ <h3 class="method-title"><code><a href="#//api/name/description">&nbsp;&nbsp;des
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group&rsquo;s description, need to fetch group&rsquo;s specification</p>
+				<p>Description of the group</p>
 			</div>
 			
 		    
@@ -266,7 +264,7 @@ <h3 class="method-title"><code><a href="#//api/name/description">&nbsp;&nbsp;des
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group&rsquo;s description, need to fetch group&rsquo;s specification</p>
+				<p>Description of the group</p>
 			</div>
 			
 
@@ -284,8 +282,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/occupantsCount" title="occupantsCount"></a>
-	<h3 class="method-title"><code><a href="#//api/name/occupantsCount">&nbsp;&nbsp;occupantsCount</a></code>
+	<a name="//api/name/)" title=")"></a>
+	<h3 class="method-title"><code><a href="#//api/name/)">&nbsp;&nbsp;)</a></code>
 </h3>
 
 	<div class="method-info">
@@ -295,12 +293,12 @@ <h3 class="method-title"><code><a href="#//api/name/occupantsCount">&nbsp;&nbsp;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The number of <a href="#//api/name/members">members</a>, need to fetch group&rsquo;s specification</p>
+				<p>The total number of group <a href="#//api/name/members">members</a></p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSInteger occupantsCount</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSInteger occupantsCount __deprecated_msg ( &quot;Use - membersCount&quot; )</code></div>
 
 		    
 			
@@ -312,7 +310,7 @@ <h3 class="method-title"><code><a href="#//api/name/occupantsCount">&nbsp;&nbsp;
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The number of <a href="#//api/name/members">members</a>, need to fetch group&rsquo;s specification</p>
+				<p>The total number of group <a href="#//api/name/members">members</a></p>
 			</div>
 			
 
@@ -341,7 +339,7 @@ <h3 class="method-title"><code><a href="#//api/name/setting">&nbsp;&nbsp;setting
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group&rsquo;s setting options, need to fetch group&rsquo;s specification</p>
+				<p>Setting options of group</p>
 			</div>
 			
 		    
@@ -358,7 +356,7 @@ <h3 class="method-title"><code><a href="#//api/name/setting">&nbsp;&nbsp;setting
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group&rsquo;s setting options, need to fetch group&rsquo;s specification</p>
+				<p>Setting options of group</p>
 			</div>
 			
 
@@ -387,7 +385,7 @@ <h3 class="method-title"><code><a href="#//api/name/owner">&nbsp;&nbsp;owner</a>
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group‘s owner, has the highest authority, need to fetch group&rsquo;s specification</p>
+				<p>Owner of the group</p>
 			</div>
 			
 		    
@@ -404,9 +402,9 @@ <h3 class="method-title"><code><a href="#//api/name/owner">&nbsp;&nbsp;owner</a>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group‘s owner, has the highest authority, need to fetch group&rsquo;s specification</p>
+				<p>Owner of the group</p>
 
-<p>A group only has one owner</p>
+<p>Each group only has one owner</p>
 			</div>
 			
 
@@ -435,7 +433,7 @@ <h3 class="method-title"><code><a href="#//api/name/members">&nbsp;&nbsp;members
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Member list of group, need to fetch group&rsquo;s specification</p>
+				<p>Member list of the group</p>
 			</div>
 			
 		    
@@ -452,55 +450,7 @@ <h3 class="method-title"><code><a href="#//api/name/members">&nbsp;&nbsp;members
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Member list of group, need to fetch group&rsquo;s specification</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">EMGroup.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div><div class="section-method">
-	<a name="//api/name/bans" title="bans"></a>
-	<h3 class="method-title"><code><a href="#//api/name/bans">&nbsp;&nbsp;bans</a></code>
-</h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>Group‘s blacklist, need to call fetching group&rsquo;s blacklist method first</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly) NSArray *bans</code></div>
-
-		    
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group‘s blacklist, need to call fetching group&rsquo;s blacklist method first</p>
-
-<p>Need owner&rsquo;s authority, will return nil if user is not the <a href="#//api/name/owner">owner</a> of the group</p>
+				<p>Member list of the group</p>
 			</div>
 			
 
@@ -529,7 +479,7 @@ <h3 class="method-title"><code><a href="#//api/name/occupants">&nbsp;&nbsp;occup
 			
 			
 			<div class="method-subsection brief-description">
-				<p>All occupants of the group, include both the <a href="#//api/name/owner">owner</a> and all <a href="#//api/name/members">members</a></p>
+				<p>All occupants of the group, includes the group <a href="#//api/name/owner">owner</a> and all other group <a href="#//api/name/members">members</a></p>
 			</div>
 			
 		    
@@ -546,7 +496,7 @@ <h3 class="method-title"><code><a href="#//api/name/occupants">&nbsp;&nbsp;occup
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>All occupants of the group, include both the <a href="#//api/name/owner">owner</a> and all <a href="#//api/name/members">members</a></p>
+				<p>All occupants of the group, includes the group <a href="#//api/name/owner">owner</a> and all other group <a href="#//api/name/members">members</a></p>
 			</div>
 			
 
@@ -575,7 +525,7 @@ <h3 class="method-title"><code><a href="#//api/name/isPushNotificationEnabled">&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether this group receive push notifications</p>
+				<p>Is Apple Push Notification Service enabled for group</p>
 			</div>
 			
 		    
@@ -592,7 +542,7 @@ <h3 class="method-title"><code><a href="#//api/name/isPushNotificationEnabled">&
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether this group receive push notifications</p>
+				<p>Is Apple Push Notification Service enabled for group</p>
 			</div>
 			
 
@@ -621,7 +571,7 @@ <h3 class="method-title"><code><a href="#//api/name/isPublic">&nbsp;&nbsp;isPubl
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether is public group, need to fetch group&rsquo;s specification</p>
+				<p>Whether is a public group</p>
 			</div>
 			
 		    
@@ -638,7 +588,7 @@ <h3 class="method-title"><code><a href="#//api/name/isPublic">&nbsp;&nbsp;isPubl
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether is public group, need to fetch group&rsquo;s specification</p>
+				<p>Whether is a public group</p>
 			</div>
 			
 
@@ -667,7 +617,7 @@ <h3 class="method-title"><code><a href="#//api/name/isBlocked">&nbsp;&nbsp;isBlo
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether block this group‘s message</p>
+				<p>Whether block the current group‘s messages</p>
 			</div>
 			
 		    
@@ -684,7 +634,7 @@ <h3 class="method-title"><code><a href="#//api/name/isBlocked">&nbsp;&nbsp;isBlo
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether block this group‘s message</p>
+				<p>Whether block the current group‘s messages</p>
 			</div>
 			
 
@@ -713,7 +663,7 @@ <h3 class="method-title"><code><a href="#//api/name/init">&ndash;&nbsp;init</a><
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize group instance</p>
+				<p>Initialize a group instance</p>
 			</div>
 			
 		    
@@ -735,7 +685,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize group instance</p>
+				<p>Initialize a group instance</p>
 
 <p>Please use [+groupWithId:]</p>
 			</div>
@@ -766,7 +716,7 @@ <h3 class="method-title"><code><a href="#//api/name/groupWithId:">+&nbsp;groupWi
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get group instance, create a instance if do not exist</p>
+				<p>Get group instance, create a instance if it does not exist</p>
 			</div>
 			
 		    
@@ -800,7 +750,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get group instance, create a instance if do not exist</p>
+				<p>Get group instance, create a instance if it does not exist</p>
 			</div>
 			
 
@@ -832,7 +782,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMGroupOptions.html b/HyphenateSDK/doc/Classes/EMGroupOptions.html
index 90362a2..1372a94 100644
--- a/HyphenateSDK/doc/Classes/EMGroupOptions.html
+++ b/HyphenateSDK/doc/Classes/EMGroupOptions.html
@@ -171,7 +171,7 @@ <h3 class="method-title"><code><a href="#//api/name/maxUsersCount">&nbsp;&nbsp;m
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The maximum number of group member(3-2000, the default is 200)</p>
+				<p>The group capacity (3-2000, the default is 200)</p>
 			</div>
 			
 		    
@@ -188,7 +188,7 @@ <h3 class="method-title"><code><a href="#//api/name/maxUsersCount">&nbsp;&nbsp;m
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The maximum number of group member(3-2000, the default is 200)</p>
+				<p>The group capacity (3-2000, the default is 200)</p>
 			</div>
 			
 
@@ -220,7 +220,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMImageMessageBody.html b/HyphenateSDK/doc/Classes/EMImageMessageBody.html
index c817eb6..b55d68f 100644
--- a/HyphenateSDK/doc/Classes/EMImageMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMImageMessageBody.html
@@ -56,7 +56,7 @@ <h1 id="library-title">
 	
 	<optgroup label="Properties">
 		
-		<option value="//api/name/compressRatio">compressRatio</option>
+		<option value="//api/name/)">)</option>
 		
 		<option value="//api/name/size">size</option>
 		
@@ -118,8 +118,7 @@ <h1 class="title">EMImageMessageBody Class Reference</h1>
 					<div class="section section-overview">
 						<a title="Overview" name="overview"></a>
 						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Image message body, SDK will compress the image of message body that created by -(instancetype)initWithData:displayName: or
--(instancetype)initWithData:thumbnailData before send the message</p>
+						<p>Image message body</p>
 					</div>
 					
 					
@@ -181,8 +180,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/compressRatio" title="compressRatio"></a>
-	<h3 class="method-title"><code><a href="#//api/name/compressRatio">&nbsp;&nbsp;compressRatio</a></code>
+	<a name="//api/name/)" title=")"></a>
+	<h3 class="method-title"><code><a href="#//api/name/)">&nbsp;&nbsp;)</a></code>
 </h3>
 
 	<div class="method-info">
@@ -192,16 +191,12 @@ <h3 class="method-title"><code><a href="#//api/name/compressRatio">&nbsp;&nbsp;c
 			
 			
 			<div class="method-subsection brief-description">
-				<ul>
-<li>Set compress ratio of image message, 1.0 without compress, default value is 0.6,
- will use the default value if try to set a value that equal to or less than 0</li>
-</ul>
-
+				<p>Image compression ratio. 1.0 without compression, default value is 0.6. SDK uses the default value if the given value is less than zero.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic) CGFloat compressRatio</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic) CGFloat compressRatio __deprecated_msg ( &quot;Use - compressionRatio&quot; )</code></div>
 
 		    
 			
@@ -213,11 +208,7 @@ <h3 class="method-title"><code><a href="#//api/name/compressRatio">&nbsp;&nbsp;c
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<ul>
-<li>Set compress ratio of image message, 1.0 without compress, default value is 0.6,
- will use the default value if try to set a value that equal to or less than 0</li>
-</ul>
-
+				<p>Image compression ratio. 1.0 without compression, default value is 0.6. SDK uses the default value if the given value is less than zero.</p>
 			</div>
 			
 
@@ -384,7 +375,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailSecretKey">&nbsp;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Secret key of thumbnail, need verify secret key when download thumbnail</p>
+				<p>Secret key for downloading a thumbnail image</p>
 			</div>
 			
 		    
@@ -401,7 +392,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailSecretKey">&nbsp;&n
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Secret key of thumbnail, need verify secret key when download thumbnail</p>
+				<p>Secret key for downloading a thumbnail image</p>
 			</div>
 			
 
@@ -430,7 +421,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailSize">&nbsp;&nbsp;t
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Size of thumbnail</p>
+				<p>Size of a thumbnail</p>
 			</div>
 			
 		    
@@ -447,7 +438,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailSize">&nbsp;&nbsp;t
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Size of thumbnail</p>
+				<p>Size of a thumbnail</p>
 			</div>
 			
 
@@ -476,7 +467,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailFileLength">&nbsp;&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>File length of thumbnail, in bytes</p>
+				<p>File length of a thumbnail, in bytes</p>
 			</div>
 			
 		    
@@ -493,7 +484,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailFileLength">&nbsp;&
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>File length of thumbnail, in bytes</p>
+				<p>File length of a thumbnail, in bytes</p>
 			</div>
 			
 
@@ -522,7 +513,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailDownloadStatus">&nb
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Download status of thumbnail</p>
+				<p>Download status of a thumbnail</p>
 			</div>
 			
 		    
@@ -539,7 +530,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailDownloadStatus">&nb
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Download status of thumbnail</p>
+				<p>Download status of a thumbnail</p>
 			</div>
 			
 
@@ -568,7 +559,7 @@ <h3 class="method-title"><code><a href="#//api/name/initWithData:thumbnailData:"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize image message body instance</p>
+				<p>Initialize an image message body instance</p>
 			</div>
 			
 		    
@@ -598,7 +589,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Image message body instance</p>
+				<p>An image message body instance</p>
 			</div>
 			
 
@@ -607,7 +598,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize image message body instance</p>
+				<p>Initialize an image message body instance</p>
 			</div>
 			
 
@@ -639,7 +630,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMLocationMessageBody.html b/HyphenateSDK/doc/Classes/EMLocationMessageBody.html
index de58e22..a56f653 100644
--- a/HyphenateSDK/doc/Classes/EMLocationMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMLocationMessageBody.html
@@ -133,7 +133,7 @@ <h3 class="method-title"><code><a href="#//api/name/latitude">&nbsp;&nbsp;latitu
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Latitude</p>
+				<p>Location latitude</p>
 			</div>
 			
 		    
@@ -150,7 +150,7 @@ <h3 class="method-title"><code><a href="#//api/name/latitude">&nbsp;&nbsp;latitu
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Latitude</p>
+				<p>Location latitude</p>
 			</div>
 			
 
@@ -179,7 +179,7 @@ <h3 class="method-title"><code><a href="#//api/name/longitude">&nbsp;&nbsp;longi
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Longitude</p>
+				<p>Loctaion longitude</p>
 			</div>
 			
 		    
@@ -196,7 +196,7 @@ <h3 class="method-title"><code><a href="#//api/name/longitude">&nbsp;&nbsp;longi
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Longitude</p>
+				<p>Loctaion longitude</p>
 			</div>
 			
 
@@ -271,7 +271,7 @@ <h3 class="method-title"><code><a href="#//api/name/initWithLatitude:longitude:a
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize location message body instance</p>
+				<p>Initialize a location message body instance</p>
 			</div>
 			
 		    
@@ -315,7 +315,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize location message body instance</p>
+				<p>Initialize a location message body instance</p>
 			</div>
 			
 
@@ -347,7 +347,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMMessage.html b/HyphenateSDK/doc/Classes/EMMessage.html
index f81bfb2..f0974ec 100644
--- a/HyphenateSDK/doc/Classes/EMMessage.html
+++ b/HyphenateSDK/doc/Classes/EMMessage.html
@@ -293,7 +293,7 @@ <h3 class="method-title"><code><a href="#//api/name/from">&nbsp;&nbsp;from</a></
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The sender</p>
+				<p>Message sender</p>
 			</div>
 			
 		    
@@ -310,7 +310,7 @@ <h3 class="method-title"><code><a href="#//api/name/from">&nbsp;&nbsp;from</a></
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The sender</p>
+				<p>Message sender</p>
 			</div>
 			
 
@@ -339,7 +339,7 @@ <h3 class="method-title"><code><a href="#//api/name/to">&nbsp;&nbsp;to</a></code
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The receiver</p>
+				<p>Message receiver</p>
 			</div>
 			
 		    
@@ -356,7 +356,7 @@ <h3 class="method-title"><code><a href="#//api/name/to">&nbsp;&nbsp;to</a></code
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The receiver</p>
+				<p>Message receiver</p>
 			</div>
 			
 
@@ -431,7 +431,7 @@ <h3 class="method-title"><code><a href="#//api/name/localTime">&nbsp;&nbsp;local
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The time of client send/received this message</p>
+				<p>The time of client send/receive the message</p>
 			</div>
 			
 		    
@@ -448,7 +448,7 @@ <h3 class="method-title"><code><a href="#//api/name/localTime">&nbsp;&nbsp;local
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The time of client send/received this message</p>
+				<p>The time of client send/receive the message</p>
 			</div>
 			
 
@@ -569,7 +569,7 @@ <h3 class="method-title"><code><a href="#//api/name/isReadAcked">&nbsp;&nbsp;isR
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether read ack has been sent or received, it indicates whether has received read ack for sender, and whether has send read ack for receiver</p>
+				<p>Whether read acknowledgement has been sent or received, it indicates whether the sender has received a message read acknowledgement, or whether the recipient has sent a message read acknowledgement</p>
 			</div>
 			
 		    
@@ -586,7 +586,7 @@ <h3 class="method-title"><code><a href="#//api/name/isReadAcked">&nbsp;&nbsp;isR
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether read ack has been sent or received, it indicates whether has received read ack for sender, and whether has send read ack for receiver</p>
+				<p>Whether read acknowledgement has been sent or received, it indicates whether the sender has received a message read acknowledgement, or whether the recipient has sent a message read acknowledgement</p>
 			</div>
 			
 
@@ -615,7 +615,7 @@ <h3 class="method-title"><code><a href="#//api/name/isDeliverAcked">&nbsp;&nbsp;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether delivery ack has been sent or received, it indicates whether has received delivery ack for send, and whether has send delivery ack for receiver, SDK will automatically send delivery ack if <a href="../Classes/EMOptions.html">EMOptions</a> has set enableDeliveryAck</p>
+				<p>Whether delivery acknowledgement has been sent or received, it indicates whether the sender has received a message deliver acknowledgement, or whether the recipient has sent a message deliver acknowledgement, SDK will automatically send delivery acknowledgement if <a href="../Classes/EMOptions.html">EMOptions</a> is set <a href="#//api/name/to">to</a> enableDeliveryAck</p>
 			</div>
 			
 		    
@@ -632,7 +632,7 @@ <h3 class="method-title"><code><a href="#//api/name/isDeliverAcked">&nbsp;&nbsp;
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether delivery ack has been sent or received, it indicates whether has received delivery ack for send, and whether has send delivery ack for receiver, SDK will automatically send delivery ack if <a href="../Classes/EMOptions.html">EMOptions</a> has set enableDeliveryAck</p>
+				<p>Whether delivery acknowledgement has been sent or received, it indicates whether the sender has received a message deliver acknowledgement, or whether the recipient has sent a message deliver acknowledgement, SDK will automatically send delivery acknowledgement if <a href="../Classes/EMOptions.html">EMOptions</a> is set <a href="#//api/name/to">to</a> enableDeliveryAck</p>
 			</div>
 			
 
@@ -772,7 +772,7 @@ <h3 class="method-title"><code><a href="#//api/name/ext">&nbsp;&nbsp;ext</a></co
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>Message extention</p>
 
-<p>Key type must be NSString, Value type must be NSString or NSNumber of BOOL, int, unsigned in, long long, double.</p>
+<p>Key type must be NSString, Value type must be NSString, int, unsigned in, long long, or double. Please use NSNumber (@YES or @NO) instead of BOOL.</p>
 			</div>
 			
 
@@ -801,7 +801,7 @@ <h3 class="method-title"><code><a href="#//api/name/initWithConversationID:from:
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize message instance</p>
+				<p>Initialize a message instance</p>
 			</div>
 			
 		    
@@ -855,7 +855,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize message instance</p>
+				<p>Initialize a message instance</p>
 			</div>
 			
 
@@ -887,7 +887,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMMessageBody.html b/HyphenateSDK/doc/Classes/EMMessageBody.html
index ff988f1..947e843 100644
--- a/HyphenateSDK/doc/Classes/EMMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMMessageBody.html
@@ -172,7 +172,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMOptions.html b/HyphenateSDK/doc/Classes/EMOptions.html
index b88af2d..d8ddeab 100644
--- a/HyphenateSDK/doc/Classes/EMOptions.html
+++ b/HyphenateSDK/doc/Classes/EMOptions.html
@@ -170,7 +170,7 @@ <h3 class="method-title"><code><a href="#//api/name/appkey">&nbsp;&nbsp;appkey</
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readonly) NSString *appkey</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *appkey</code></div>
 
 		    
 			
@@ -368,7 +368,7 @@ <h3 class="method-title"><code><a href="#//api/name/isSandboxMode">&nbsp;&nbsp;i
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>Whether using development environment, default is NO</p>
 
-<p>Can only set when initialize sdk <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t change it in runtime</p>
+<p>Can only be set when initializing the sdk with <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t be altered in runtime.</p>
 			</div>
 			
 
@@ -416,7 +416,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoLogin">&nbsp;&nbsp;isA
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>Whether auto login, default is YES</p>
 
-<p>Value will be saved to the local. When initialization EMOptions, the first to get the value of the local saved</p>
+<p>Value is saved locally. When initializing the EMOptions, SDK looks for the local value first.</p>
 			</div>
 			
 
@@ -445,7 +445,7 @@ <h3 class="method-title"><code><a href="#//api/name/isDeleteMessagesWhenExitGrou
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether delete all of the group&rsquo;s message when leave group, default is YES</p>
+				<p>Whether to delete all the group messages when leaving the group, default is YES</p>
 			</div>
 			
 		    
@@ -462,7 +462,7 @@ <h3 class="method-title"><code><a href="#//api/name/isDeleteMessagesWhenExitGrou
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether delete all of the group&rsquo;s message when leave group, default is YES</p>
+				<p>Whether to delete all the group messages when leaving the group, default is YES</p>
 			</div>
 			
 
@@ -491,7 +491,7 @@ <h3 class="method-title"><code><a href="#//api/name/isDeleteMessagesWhenExitChat
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether delete all of the chatroom&rsquo;s message when leave chatroom, default is YES</p>
+				<p>Whether to delete all the chat room messages when leaving the chat room, default is YES</p>
 			</div>
 			
 		    
@@ -508,7 +508,7 @@ <h3 class="method-title"><code><a href="#//api/name/isDeleteMessagesWhenExitChat
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether delete all of the chatroom&rsquo;s message when leave chatroom, default is YES</p>
+				<p>Whether to delete all the chat room messages when leaving the chat room, default is YES</p>
 			</div>
 			
 
@@ -537,7 +537,7 @@ <h3 class="method-title"><code><a href="#//api/name/isChatroomOwnerLeaveAllowed"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether chatroom&rsquo;s owner can leave chatroom, default is YES</p>
+				<p>Whether chat room&rsquo;s owner can leave the chat room, default is YES.</p>
 			</div>
 			
 		    
@@ -554,7 +554,7 @@ <h3 class="method-title"><code><a href="#//api/name/isChatroomOwnerLeaveAllowed"
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether chatroom&rsquo;s owner can leave chatroom, default is YES</p>
+				<p>Whether chat room&rsquo;s owner can leave the chat room, default is YES.</p>
 			</div>
 			
 
@@ -583,7 +583,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoAcceptGroupInvitation"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether automatically accept group invitation, default is YES</p>
+				<p>Whether to automatically accept group invitation, default is YES</p>
 			</div>
 			
 		    
@@ -600,7 +600,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoAcceptGroupInvitation"
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether automatically accept group invitation, default is YES</p>
+				<p>Whether to automatically accept group invitation, default is YES</p>
 			</div>
 			
 
@@ -629,7 +629,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoAcceptFriendInvitation
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether automatically accept friend invitation, default is NO</p>
+				<p>Whether to automatically approve friend request, default is NO</p>
 			</div>
 			
 		    
@@ -646,7 +646,7 @@ <h3 class="method-title"><code><a href="#//api/name/isAutoAcceptFriendInvitation
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether automatically accept friend invitation, default is NO</p>
+				<p>Whether to automatically approve friend request, default is NO</p>
 			</div>
 			
 
@@ -675,7 +675,7 @@ <h3 class="method-title"><code><a href="#//api/name/enableDeliveryAck">&nbsp;&nb
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether send delivery ack, default is NO, SDK will automatically send delivery ack when receive a single chat message if it&rsquo;s set to YES</p>
+				<p>Whether to send delivery acknowledgement, default is NO. If set to YES, SDK will automatically send a delivery acknowledgement when receiving a chat message</p>
 			</div>
 			
 		    
@@ -692,7 +692,7 @@ <h3 class="method-title"><code><a href="#//api/name/enableDeliveryAck">&nbsp;&nb
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether send delivery ack, default is NO, SDK will automatically send delivery ack when receive a single chat message if it&rsquo;s set to YES</p>
+				<p>Whether to send delivery acknowledgement, default is NO. If set to YES, SDK will automatically send a delivery acknowledgement when receiving a chat message</p>
 			</div>
 			
 
@@ -721,7 +721,7 @@ <h3 class="method-title"><code><a href="#//api/name/sortMessageByServerTime">&nb
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether sort message by server time when load message from database, default is YES, sort by server time</p>
+				<p>Whether to sort messages by server received time when loading message from database, default is YES.</p>
 			</div>
 			
 		    
@@ -738,7 +738,7 @@ <h3 class="method-title"><code><a href="#//api/name/sortMessageByServerTime">&nb
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether sort message by server time when load message from database, default is YES, sort by server time</p>
+				<p>Whether to sort messages by server received time when loading message from database, default is YES.</p>
 			</div>
 			
 
@@ -767,12 +767,12 @@ <h3 class="method-title"><code><a href="#//api/name/apnsCertName">&nbsp;&nbsp;ap
 			
 			
 			<div class="method-subsection brief-description">
-				<p>iOS only, push certificate name</p>
+				<p>Certificate name of Apple Push Notification Service</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) NSString *apnsCertName</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *apnsCertName</code></div>
 
 		    
 			
@@ -784,9 +784,9 @@ <h3 class="method-title"><code><a href="#//api/name/apnsCertName">&nbsp;&nbsp;ap
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>iOS only, push certificate name</p>
+				<p>Certificate name of Apple Push Notification Service</p>
 
-<p>Can only set when initialize SDK <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t change it in runtime</p>
+<p>Can only be set when initializing the SDK with <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t be altered in runtime.</p>
 			</div>
 			
 
@@ -815,7 +815,7 @@ <h3 class="method-title"><code><a href="#//api/name/optionsWithAppkey:">+&nbsp;o
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get SDK setting options instance</p>
+				<p>Get a SDK setting options instance</p>
 			</div>
 			
 		    
@@ -849,7 +849,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get SDK setting options instance</p>
+				<p>Get a SDK setting options instance</p>
 			</div>
 			
 
@@ -886,7 +886,7 @@ <h3 class="method-title"><code><a href="#//api/name/enableDnsConfig">&nbsp;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Whether allow to use DNS, default is YES</p>
+				<p>Whether to allow using DNS, default is YES</p>
 			</div>
 			
 		    
@@ -903,9 +903,9 @@ <h3 class="method-title"><code><a href="#//api/name/enableDnsConfig">&nbsp;&nbsp
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Whether allow to use DNS, default is YES</p>
+				<p>Whether to allow using DNS, default is YES</p>
 
-<p>Can only set when initialize SDK <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t change it in runtime</p>
+<p>Can only be set when initializing the SDK <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, cannot be altered in runtime</p>
 			</div>
 			
 
@@ -953,7 +953,8 @@ <h3 class="method-title"><code><a href="#//api/name/chatPort">&nbsp;&nbsp;chatPo
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>IM server port</p>
 
-<p>It&rsquo;s effective only when enableDnsConfig is NO. Can only set when initialize SDK <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t change it in runtime</p>
+<p>chatPort is Only effective when isDNSEnabled is NO.
+Can only be set when initializing the SDK with <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, cannot be altered in runtime</p>
 			</div>
 			
 
@@ -987,7 +988,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatServer">&nbsp;&nbsp;chat
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) NSString *chatServer</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *chatServer</code></div>
 
 		    
 			
@@ -1001,7 +1002,7 @@ <h3 class="method-title"><code><a href="#//api/name/chatServer">&nbsp;&nbsp;chat
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>IM server</p>
 
-<p>It&rsquo;s effective only when enableDnsConfig is NO. Can only set when initialize SDK <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t change it in runtime</p>
+<p>chatServer is Only effective when isDNSEnabled is NO. Can only be set when initializing the SDK with <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, cannot be altered in runtime</p>
 			</div>
 			
 
@@ -1035,7 +1036,7 @@ <h3 class="method-title"><code><a href="#//api/name/restServer">&nbsp;&nbsp;rest
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) NSString *restServer</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *restServer</code></div>
 
 		    
 			
@@ -1049,7 +1050,7 @@ <h3 class="method-title"><code><a href="#//api/name/restServer">&nbsp;&nbsp;rest
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>REST server</p>
 
-<p>It&rsquo;s effective only when enableDnsConfig is NO. Can only set when initialize SDK <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, can&rsquo;t change it in runtime</p>
+<p>restServer Only effective when isDNSEnabled is NO. Can only be set when initializing the SDK with <a href="../Classes/EMClient.html#//api/name/initializeSDKWithOptions:">[EMClient initializeSDKWithOptions:]</a>, cannot be altered in runtime</p>
 			</div>
 			
 
@@ -1081,7 +1082,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMPushOptions.html b/HyphenateSDK/doc/Classes/EMPushOptions.html
index b9ed1aa..400c06c 100644
--- a/HyphenateSDK/doc/Classes/EMPushOptions.html
+++ b/HyphenateSDK/doc/Classes/EMPushOptions.html
@@ -56,9 +56,9 @@ <h1 id="library-title">
 	
 	<optgroup label="Properties">
 		
-		<option value="//api/name/displayStyle">displayStyle</option>
+		<option value="//api/name/)">)</option>
 		
-		<option value="//api/name/nickname">nickname</option>
+		<option value="//api/name/displayStyle">displayStyle</option>
 		
 		<option value="//api/name/noDisturbStatus">noDisturbStatus</option>
 		
@@ -104,7 +104,7 @@ <h1 class="title">EMPushOptions Class Reference</h1>
 					<div class="section section-overview">
 						<a title="Overview" name="overview"></a>
 						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Apple APNS setting options</p>
+						<p>Apple Push Notification setting options</p>
 					</div>
 					
 					
@@ -120,8 +120,8 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/nickname" title="nickname"></a>
-	<h3 class="method-title"><code><a href="#//api/name/nickname">&nbsp;&nbsp;nickname</a></code>
+	<a name="//api/name/)" title=")"></a>
+	<h3 class="method-title"><code><a href="#//api/name/)">&nbsp;&nbsp;)</a></code>
 </h3>
 
 	<div class="method-info">
@@ -131,12 +131,12 @@ <h3 class="method-title"><code><a href="#//api/name/nickname">&nbsp;&nbsp;nickna
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Nick name to show for push message</p>
+				<p>User&rsquo;s nickname to be displayed in apple push notification service messages</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>@property (nonatomic, strong) NSString *nickname</code></div>
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, copy) NSString *__deprecated_msg ( &quot;Use - displayName&quot; )</code></div>
 
 		    
 			
@@ -148,7 +148,7 @@ <h3 class="method-title"><code><a href="#//api/name/nickname">&nbsp;&nbsp;nickna
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Nick name to show for push message</p>
+				<p>User&rsquo;s nickname to be displayed in apple push notification service messages</p>
 			</div>
 			
 
@@ -177,7 +177,7 @@ <h3 class="method-title"><code><a href="#//api/name/displayStyle">&nbsp;&nbsp;di
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Display style of push message</p>
+				<p>Display style of notification message</p>
 			</div>
 			
 		    
@@ -194,7 +194,7 @@ <h3 class="method-title"><code><a href="#//api/name/displayStyle">&nbsp;&nbsp;di
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Display style of push message</p>
+				<p>Display style of notification message</p>
 			</div>
 			
 
@@ -223,7 +223,7 @@ <h3 class="method-title"><code><a href="#//api/name/noDisturbStatus">&nbsp;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>No-disturb setting of push message</p>
+				<p>No disturbing setting of notification message</p>
 			</div>
 			
 		    
@@ -240,7 +240,7 @@ <h3 class="method-title"><code><a href="#//api/name/noDisturbStatus">&nbsp;&nbsp
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>No-disturb setting of push message</p>
+				<p>No disturbing setting of notification message</p>
 			</div>
 			
 
@@ -269,7 +269,7 @@ <h3 class="method-title"><code><a href="#//api/name/noDisturbingStartH">&nbsp;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>No-disturn mode start time, only supports hour</p>
+				<p>No disturbing mode start time (in hour)</p>
 			</div>
 			
 		    
@@ -286,7 +286,7 @@ <h3 class="method-title"><code><a href="#//api/name/noDisturbingStartH">&nbsp;&n
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>No-disturn mode start time, only supports hour</p>
+				<p>No disturbing mode start time (in hour)</p>
 			</div>
 			
 
@@ -315,7 +315,7 @@ <h3 class="method-title"><code><a href="#//api/name/noDisturbingEndH">&nbsp;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>No-disturn mode end time, only supports hour</p>
+				<p>No disturbing mode end time (in hour)</p>
 			</div>
 			
 		    
@@ -332,7 +332,7 @@ <h3 class="method-title"><code><a href="#//api/name/noDisturbingEndH">&nbsp;&nbs
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>No-disturn mode end time, only supports hour</p>
+				<p>No disturbing mode end time (in hour)</p>
 			</div>
 			
 
@@ -364,7 +364,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMTextMessageBody.html b/HyphenateSDK/doc/Classes/EMTextMessageBody.html
index 30456ee..a503491 100644
--- a/HyphenateSDK/doc/Classes/EMTextMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMTextMessageBody.html
@@ -175,7 +175,7 @@ <h3 class="method-title"><code><a href="#//api/name/initWithText:">&ndash;&nbsp;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Initialize <a href="#//api/name/text">text</a> message body instance</p>
+				<p>Initialize a <a href="#//api/name/text">text</a> message body instance</p>
 			</div>
 			
 		    
@@ -209,7 +209,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Initialize <a href="#//api/name/text">text</a> message body instance</p>
+				<p>Initialize a <a href="#//api/name/text">text</a> message body instance</p>
 			</div>
 			
 
@@ -241,7 +241,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMVideoMessageBody.html b/HyphenateSDK/doc/Classes/EMVideoMessageBody.html
index dd47984..0e487a3 100644
--- a/HyphenateSDK/doc/Classes/EMVideoMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMVideoMessageBody.html
@@ -271,7 +271,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailSecretKey">&nbsp;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Secret key of thumbnail, need verify secret key when download thumbnail</p>
+				<p>Secret key of thumbnail, required to download a thumbnail</p>
 			</div>
 			
 		    
@@ -288,7 +288,7 @@ <h3 class="method-title"><code><a href="#//api/name/thumbnailSecretKey">&nbsp;&n
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Secret key of thumbnail, need verify secret key when download thumbnail</p>
+				<p>Secret key of thumbnail, required to download a thumbnail</p>
 			</div>
 			
 
@@ -412,7 +412,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/EMVoiceMessageBody.html b/HyphenateSDK/doc/Classes/EMVoiceMessageBody.html
index 7ce7a2c..1c0e7b5 100644
--- a/HyphenateSDK/doc/Classes/EMVoiceMessageBody.html
+++ b/HyphenateSDK/doc/Classes/EMVoiceMessageBody.html
@@ -172,7 +172,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Classes/OpenGLView20.html b/HyphenateSDK/doc/Classes/OpenGLView20.html
deleted file mode 100644
index 1302f1f..0000000
--- a/HyphenateSDK/doc/Classes/OpenGLView20.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>OpenGLView20 Class Reference</title>
-
-	<link rel="stylesheet" href="../css/style.css">
-	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
-	<meta name="generator" content="appledoc 2.2.1 (build 1334)">
-</head>
-<body class="appledoc">
-	<header>
-		<div class="container" class="hide-in-xcode">
-			
-			<h1 id="library-title">
-				<a href="../index.html">HyphenateSDK </a>
-			</h1>
-
-			<p id="developer-home">
-				<a href="../index.html">Hyphenate Inc.</a>
-			</p>
-			
-		</div>
-	</header>
-
-	<aside>
-		<div class="container">
-			<nav>
-				<ul id="header-buttons" role="toolbar">
-					<li><a href="../index.html">Index</a></li>
-<li><a href="../hierarchy.html">Hierarchy</a></li>
-
-					<li id="on-this-page" role="navigation">
-						<label>
-							On This Page
-
-							<div class="chevron">
-								<div class="chevy chevron-left"></div>
-								<div class="chevy chevron-right"></div>
-							</div>
-
-							<select id="jump-to">
-	<option value="top">Jump To&#133;</option>
-	
-	<option value="overview">Overview</option>
-	
-
-	
-	
-	<option value="tasks">Tasks</option>
-	
-	
-
-	
-	
-
-	
-
-	
-	<optgroup label="Instance Methods">
-		
-		<option value="//api/name/clearFrame">- clearFrame</option>
-		
-		<option value="//api/name/displayYUV420pData:width:height:">- displayYUV420pData:width:height:</option>
-		
-		<option value="//api/name/setVideoSize:height:">- setVideoSize:height:</option>
-		
-	</optgroup>
-	
-	
-</select>
-						</label>
-					</li>
-				</ul>
-			</nav>
-		</div>
-	</aside>
-
-	<article>
-		<div id="overview_contents" class="container">
-			<div id="content">
-				<main role="main">
-					<h1 class="title">OpenGLView20 Class Reference</h1>
-
-					
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<th>Inherits from</th>
-	<td>UIView</td>
-</tr><tr>
-	<th>Declared in</th>
-	<td>OpenGLView20.h</td>
-</tr>
-						</tbody></table></div>
-					
-
-                    
-					
-					<div class="section section-overview">
-						<a title="Overview" name="overview"></a>
-						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>@header OpenGLView20.h</p>
-					</div>
-					
-					
-
-					
-					
-					<div class="section section-tasks">
-						<a title="Tasks" name="tasks"></a>
-						
-
-						
-						
-
-						<div class="task-list">
-							<div class="section-method">
-	<a name="//api/name/displayYUV420pData:width:height:" title="displayYUV420pData:width:height:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/displayYUV420pData:width:height:">&ndash;&nbsp;displayYUV420pData:width:height:</a></code>
-</h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>将数据画到屏幕上</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>- (void)displayYUV420pData:(char *)<em>data</em> width:(GLuint)<em>width</em> height:(GLuint)<em>height</em></code></div>
-
-		    
-			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>data</code></th>
-						<td><p>数据</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>width</code></th>
-						<td><p>宽度</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>height</code></th>
-						<td><p>高度</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>@method</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">OpenGLView20.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div><div class="section-method">
-	<a name="//api/name/setVideoSize:height:" title="setVideoSize:height:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/setVideoSize:height:">&ndash;&nbsp;setVideoSize:height:</a></code>
-</h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>设置视频显示区域大小</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>- (void)setVideoSize:(GLuint)<em>width</em> height:(GLuint)<em>height</em></code></div>
-
-		    
-			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>width</code></th>
-						<td><p>宽度</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>height</code></th>
-						<td><p>高度</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>@method</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">OpenGLView20.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div><div class="section-method">
-	<a name="//api/name/clearFrame" title="clearFrame"></a>
-	<h3 class="method-title"><code><a href="#//api/name/clearFrame">&ndash;&nbsp;clearFrame</a></code>
-</h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>清除画面</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>- (void)clearFrame</code></div>
-
-		    
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>@method</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">OpenGLView20.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div>
-						</div>
-						
-					</div>
-					
-					
-
-                    
-                    
-          
-				</main>
-
-				<footer>
-					<div class="footer-copyright">
-						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
-						
-						
-						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
-						
-					</div>
-				</footer>
-			</div>
-		</div>
-	</article>
-
-	<script src="../js/script.js"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/HyphenateSDK/doc/Protocols/EMCallManagerDelegate.html b/HyphenateSDK/doc/Protocols/EMCallManagerDelegate.html
index 13d0792..838d177 100644
--- a/HyphenateSDK/doc/Protocols/EMCallManagerDelegate.html
+++ b/HyphenateSDK/doc/Protocols/EMCallManagerDelegate.html
@@ -60,17 +60,17 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/didReceiveCallAccepted:">- didReceiveCallAccepted:</option>
+		<option value="//api/name/callDidAccept:">- callDidAccept:</option>
 		
-		<option value="//api/name/didReceiveCallConnected:">- didReceiveCallConnected:</option>
+		<option value="//api/name/callDidConnect:">- callDidConnect:</option>
 		
-		<option value="//api/name/didReceiveCallIncoming:">- didReceiveCallIncoming:</option>
+		<option value="//api/name/callDidEnd:reason:error:">- callDidEnd:reason:error:</option>
 		
-		<option value="//api/name/didReceiveCallNetworkChanged:status:">- didReceiveCallNetworkChanged:status:</option>
+		<option value="//api/name/callDidReceive:">- callDidReceive:</option>
 		
-		<option value="//api/name/didReceiveCallTerminated:reason:error:">- didReceiveCallTerminated:reason:error:</option>
+		<option value="//api/name/callNetworkStatusDidChange:status:">- callNetworkStatusDidChange:status:</option>
 		
-		<option value="//api/name/didReceiveCallUpdated:type:">- didReceiveCallUpdated:type:</option>
+		<option value="//api/name/callStateDidChange:type:">- callStateDidChange:type:</option>
 		
 	</optgroup>
 	
@@ -122,8 +122,8 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/didReceiveCallIncoming:" title="didReceiveCallIncoming:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCallIncoming:">&ndash;&nbsp;didReceiveCallIncoming:</a></code>
+	<a name="//api/name/callDidReceive:" title="callDidReceive:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/callDidReceive:">&ndash;&nbsp;callDidReceive:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -133,12 +133,13 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallIncoming:">&nd
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User B will receive this callback after user A dial user B</p>
+				<p>Delegate method will be invoked when receiving a call.
+User B will receive this callback after user A dial user B.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCallIncoming:(EMCallSession *)<em>aSession</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)callDidReceive:(EMCallSession *)<em>aSession</em></code></div>
 
 		    
 			
@@ -162,7 +163,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User B will receive this callback after user A dial user B</p>
+				<p>Delegate method will be invoked when receiving a call.
+User B will receive this callback after user A dial user B.</p>
 			</div>
 			
 
@@ -180,8 +182,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveCallConnected:" title="didReceiveCallConnected:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCallConnected:">&ndash;&nbsp;didReceiveCallConnected:</a></code>
+	<a name="//api/name/callDidConnect:" title="callDidConnect:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/callDidConnect:">&ndash;&nbsp;callDidConnect:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -191,12 +193,13 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallConnected:">&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Both user A and B will receive this callback after connection is established</p>
+				<p>Delegate method invokes when the connection is established.
+Both user A and B will receive this callback.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCallConnected:(EMCallSession *)<em>aSession</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)callDidConnect:(EMCallSession *)<em>aSession</em></code></div>
 
 		    
 			
@@ -220,7 +223,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Both user A and B will receive this callback after connection is established</p>
+				<p>Delegate method invokes when the connection is established.
+Both user A and B will receive this callback.</p>
 			</div>
 			
 
@@ -238,8 +242,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveCallAccepted:" title="didReceiveCallAccepted:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCallAccepted:">&ndash;&nbsp;didReceiveCallAccepted:</a></code>
+	<a name="//api/name/callDidAccept:" title="callDidAccept:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/callDidAccept:">&ndash;&nbsp;callDidAccept:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -249,15 +253,28 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallAccepted:">&nd
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after user B accept A&rsquo;s call</p>
+				<p>Delegate method invokes when the outgoing call is accepted by the recipient.
+User A will receive this callback after user B accept A&rsquo;s call.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCallAccepted:(EMCallSession *)<em>aSession</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)callDidAccept:(EMCallSession *)<em>aSession</em></code></div>
 
 		    
 			
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>Session</code></th>
+						<td><p>instance</p></td>
+					</tr>
+				
+				</table>
+			</div>
+			
 
 			
 
@@ -266,9 +283,8 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallAccepted:">&nd
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after user B accept A&rsquo;s call</p>
-
-<p>@param aSession</p>
+				<p>Delegate method invokes when the outgoing call is accepted by the recipient.
+User A will receive this callback after user B accept A&rsquo;s call.</p>
 			</div>
 			
 
@@ -286,8 +302,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveCallTerminated:reason:error:" title="didReceiveCallTerminated:reason:error:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCallTerminated:reason:error:">&ndash;&nbsp;didReceiveCallTerminated:reason:error:</a></code>
+	<a name="//api/name/callDidEnd:reason:error:" title="callDidEnd:reason:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/callDidEnd:reason:error:">&ndash;&nbsp;callDidEnd:reason:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -297,13 +313,14 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallTerminated:rea
 			
 			
 			<div class="method-subsection brief-description">
-				<p>1.The another peer will receive this callback after user A or user B terminate the call.
-2.Both user A and B will receive this callback after error occur.</p>
+				<p>Delegate method invokes when the other party ends the call or some error happens.
+1.The another party will receive this callback after user A or user B end the call.
+2.Both user A and B will receive this callback after error occured.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCallTerminated:(EMCallSession *)<em>aSession</em> reason:(EMCallEndReason)<em>aReason</em> error:(EMError *)<em>aError</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)callDidEnd:(EMCallSession *)<em>aSession</em> reason:(EMCallEndReason)<em>aReason</em> error:(EMError *)<em>aError</em></code></div>
 
 		    
 			
@@ -317,13 +334,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aReason</code></th>
-						<td><p>Terminate reason</p></td>
+						<th scope="row" class="argument-name"><code>aError</code></th>
+						<td><p><a href="../Classes/EMError.html">EMError</a></p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aError</code></th>
-						<td><p>Error</p></td>
+						<th scope="row" class="argument-name"><code>aOption</code></th>
+						<td><p>The reason of ending the call</p></td>
 					</tr>
 				
 				</table>
@@ -337,8 +354,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>1.The another peer will receive this callback after user A or user B terminate the call.
-2.Both user A and B will receive this callback after error occur.</p>
+				<p>Delegate method invokes when the other party ends the call or some error happens.
+1.The another party will receive this callback after user A or user B end the call.
+2.Both user A and B will receive this callback after error occured.</p>
 			</div>
 			
 
@@ -356,8 +374,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveCallUpdated:type:" title="didReceiveCallUpdated:type:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCallUpdated:type:">&ndash;&nbsp;didReceiveCallUpdated:type:</a></code>
+	<a name="//api/name/callStateDidChange:type:" title="callStateDidChange:type:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/callStateDidChange:type:">&ndash;&nbsp;callStateDidChange:type:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -367,12 +385,13 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallUpdated:type:"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A and B is on the call, A pause or resume the data stream, B will receive the callback</p>
+				<p>Delegate method invokes when the other party pauses or resumes the call.
+User A and B are on the same call, A pauses or resumes the call, B will receive this callback.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCallUpdated:(EMCallSession *)<em>aSession</em> type:(EMCallStreamControlType)<em>aType</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)callStateDidChange:(EMCallSession *)<em>aSession</em> type:(EMCallStreamingStatus)<em>aType</em></code></div>
 
 		    
 			
@@ -387,7 +406,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aType</code></th>
-						<td><p>Type</p></td>
+						<td><p>Current call status</p></td>
 					</tr>
 				
 				</table>
@@ -401,7 +420,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A and B is on the call, A pause or resume the data stream, B will receive the callback</p>
+				<p>Delegate method invokes when the other party pauses or resumes the call.
+User A and B are on the same call, A pauses or resumes the call, B will receive this callback.</p>
 			</div>
 			
 
@@ -419,8 +439,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveCallNetworkChanged:status:" title="didReceiveCallNetworkChanged:status:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCallNetworkChanged:status:">&ndash;&nbsp;didReceiveCallNetworkChanged:status:</a></code>
+	<a name="//api/name/callNetworkStatusDidChange:status:" title="callNetworkStatusDidChange:status:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/callNetworkStatusDidChange:status:">&ndash;&nbsp;callNetworkStatusDidChange:status:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -430,12 +450,13 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCallNetworkChanged
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A and B is on the call, A network status is not stable, A will receive the callback</p>
+				<p>Delegate method invokes when the local network status changes.
+User A and B are on the same call, A&rsquo;s network status changes from active to unstable or unavailable, and A will receive the callback.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCallNetworkChanged:(EMCallSession *)<em>aSession</em> status:(EMCallNetworkStatus)<em>aStatus</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)callNetworkStatusDidChange:(EMCallSession *)<em>aSession</em> status:(EMCallNetworkStatus)<em>aStatus</em></code></div>
 
 		    
 			
@@ -450,7 +471,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aStatus</code></th>
-						<td><p>Current status</p></td>
+						<td><p>Current network status</p></td>
 					</tr>
 				
 				</table>
@@ -464,7 +485,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A and B is on the call, A network status is not stable, A will receive the callback</p>
+				<p>Delegate method invokes when the local network status changes.
+User A and B are on the same call, A&rsquo;s network status changes from active to unstable or unavailable, and A will receive the callback.</p>
 			</div>
 			
 
@@ -496,7 +518,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/EMChatManagerDelegate.html b/HyphenateSDK/doc/Protocols/EMChatManagerDelegate.html
index 36d1f14..d01e424 100644
--- a/HyphenateSDK/doc/Protocols/EMChatManagerDelegate.html
+++ b/HyphenateSDK/doc/Protocols/EMChatManagerDelegate.html
@@ -60,19 +60,19 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/didMessageAttachmentsStatusChanged:error:">- didMessageAttachmentsStatusChanged:error:</option>
+		<option value="//api/name/cmdMessagesDidReceive:">- cmdMessagesDidReceive:</option>
 		
-		<option value="//api/name/didMessageStatusChanged:error:">- didMessageStatusChanged:error:</option>
+		<option value="//api/name/conversationListDidUpdate:">- conversationListDidUpdate:</option>
 		
-		<option value="//api/name/didReceiveCmdMessages:">- didReceiveCmdMessages:</option>
+		<option value="//api/name/messageAttachmentStatusDidChange:error:">- messageAttachmentStatusDidChange:error:</option>
 		
-		<option value="//api/name/didReceiveHasDeliveredAcks:">- didReceiveHasDeliveredAcks:</option>
+		<option value="//api/name/messageStatusDidChange:error:">- messageStatusDidChange:error:</option>
 		
-		<option value="//api/name/didReceiveHasReadAcks:">- didReceiveHasReadAcks:</option>
+		<option value="//api/name/messagesDidDeliver:">- messagesDidDeliver:</option>
 		
-		<option value="//api/name/didReceiveMessages:">- didReceiveMessages:</option>
+		<option value="//api/name/messagesDidRead:">- messagesDidRead:</option>
 		
-		<option value="//api/name/didUpdateConversationList:">- didUpdateConversationList:</option>
+		<option value="//api/name/messagesDidReceive:">- messagesDidReceive:</option>
 		
 	</optgroup>
 	
@@ -124,8 +124,8 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/didUpdateConversationList:" title="didUpdateConversationList:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didUpdateConversationList:">&ndash;&nbsp;didUpdateConversationList:</a></code>
+	<a name="//api/name/conversationListDidUpdate:" title="conversationListDidUpdate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/conversationListDidUpdate:">&ndash;&nbsp;conversationListDidUpdate:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -135,12 +135,12 @@ <h3 class="method-title"><code><a href="#//api/name/didUpdateConversationList:">
 			
 			
 			<div class="method-subsection brief-description">
-				<p>The conversation list has changed</p>
+				<p>Delegate method will be invoked when the conversation list has changed</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didUpdateConversationList:(NSArray *)<em>aConversationList</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)conversationListDidUpdate:(NSArray *)<em>aConversationList</em></code></div>
 
 		    
 			
@@ -164,7 +164,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>The conversation list has changed</p>
+				<p>Delegate method will be invoked when the conversation list has changed</p>
 			</div>
 			
 
@@ -182,8 +182,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveMessages:" title="didReceiveMessages:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveMessages:">&ndash;&nbsp;didReceiveMessages:</a></code>
+	<a name="//api/name/messagesDidReceive:" title="messagesDidReceive:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/messagesDidReceive:">&ndash;&nbsp;messagesDidReceive:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -193,12 +193,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveMessages:">&ndash;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Received messages</p>
+				<p>Delegate method will be invoked when receiving new messages</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveMessages:(NSArray *)<em>aMessages</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)messagesDidReceive:(NSArray *)<em>aMessages</em></code></div>
 
 		    
 			
@@ -208,7 +208,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessages</code></th>
-						<td><p>Message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
+						<td><p>Receivecd message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
 					</tr>
 				
 				</table>
@@ -222,7 +222,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Received messages</p>
+				<p>Delegate method will be invoked when receiving new messages</p>
 			</div>
 			
 
@@ -240,8 +240,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveCmdMessages:" title="didReceiveCmdMessages:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveCmdMessages:">&ndash;&nbsp;didReceiveCmdMessages:</a></code>
+	<a name="//api/name/cmdMessagesDidReceive:" title="cmdMessagesDidReceive:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/cmdMessagesDidReceive:">&ndash;&nbsp;cmdMessagesDidReceive:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -251,12 +251,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveCmdMessages:">&nda
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Received cmd messages</p>
+				<p>Delegate method will be invoked when receiving command messages</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveCmdMessages:(NSArray *)<em>aCmdMessages</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)cmdMessagesDidReceive:(NSArray *)<em>aCmdMessages</em></code></div>
 
 		    
 			
@@ -266,7 +266,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aCmdMessages</code></th>
-						<td><p>Cmd message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
+						<td><p>Command message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
 					</tr>
 				
 				</table>
@@ -280,7 +280,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Received cmd messages</p>
+				<p>Delegate method will be invoked when receiving command messages</p>
 			</div>
 			
 
@@ -298,8 +298,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveHasReadAcks:" title="didReceiveHasReadAcks:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveHasReadAcks:">&ndash;&nbsp;didReceiveHasReadAcks:</a></code>
+	<a name="//api/name/messagesDidRead:" title="messagesDidRead:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/messagesDidRead:">&ndash;&nbsp;messagesDidRead:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -309,12 +309,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveHasReadAcks:">&nda
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Received read acks</p>
+				<p>Delegate method will be invoked when receiving read acknowledgements for message list</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveHasReadAcks:(NSArray *)<em>aMessages</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)messagesDidRead:(NSArray *)<em>aMessages</em></code></div>
 
 		    
 			
@@ -324,7 +324,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessages</code></th>
-						<td><p>Read acked message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
+						<td><p>Acknowledged message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
 					</tr>
 				
 				</table>
@@ -338,7 +338,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Received read acks</p>
+				<p>Delegate method will be invoked when receiving read acknowledgements for message list</p>
 			</div>
 			
 
@@ -356,8 +356,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveHasDeliveredAcks:" title="didReceiveHasDeliveredAcks:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveHasDeliveredAcks:">&ndash;&nbsp;didReceiveHasDeliveredAcks:</a></code>
+	<a name="//api/name/messagesDidDeliver:" title="messagesDidDeliver:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/messagesDidDeliver:">&ndash;&nbsp;messagesDidDeliver:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -367,12 +367,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveHasDeliveredAcks:"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Received deliver acks</p>
+				<p>Delegate method will be invoked when receiving deliver acknowledgements for message list</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveHasDeliveredAcks:(NSArray *)<em>aMessages</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)messagesDidDeliver:(NSArray *)<em>aMessages</em></code></div>
 
 		    
 			
@@ -382,7 +382,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessages</code></th>
-						<td><p>Deliver acked message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
+						<td><p>Acknowledged message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
 					</tr>
 				
 				</table>
@@ -396,7 +396,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Received deliver acks</p>
+				<p>Delegate method will be invoked when receiving deliver acknowledgements for message list</p>
 			</div>
 			
 
@@ -414,8 +414,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didMessageStatusChanged:error:" title="didMessageStatusChanged:error:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didMessageStatusChanged:error:">&ndash;&nbsp;didMessageStatusChanged:error:</a></code>
+	<a name="//api/name/messageStatusDidChange:error:" title="messageStatusDidChange:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/messageStatusDidChange:error:">&ndash;&nbsp;messageStatusDidChange:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -425,12 +425,12 @@ <h3 class="method-title"><code><a href="#//api/name/didMessageStatusChanged:erro
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Message status has changed</p>
+				<p>Delegate method will be invoked when message status has changed</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didMessageStatusChanged:(EMMessage *)<em>aMessage</em> error:(EMError *)<em>aError</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)messageStatusDidChange:(EMMessage *)<em>aMessage</em> error:(EMError *)<em>aError</em></code></div>
 
 		    
 			
@@ -440,7 +440,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessage</code></th>
-						<td><p>Message whose status changed</p></td>
+						<td><p>Message whose status has changed</p></td>
 					</tr>
 				
 					<tr>
@@ -459,7 +459,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Message status has changed</p>
+				<p>Delegate method will be invoked when message status has changed</p>
 			</div>
 			
 
@@ -477,8 +477,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didMessageAttachmentsStatusChanged:error:" title="didMessageAttachmentsStatusChanged:error:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didMessageAttachmentsStatusChanged:error:">&ndash;&nbsp;didMessageAttachmentsStatusChanged:error:</a></code>
+	<a name="//api/name/messageAttachmentStatusDidChange:error:" title="messageAttachmentStatusDidChange:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/messageAttachmentStatusDidChange:error:">&ndash;&nbsp;messageAttachmentStatusDidChange:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -488,12 +488,12 @@ <h3 class="method-title"><code><a href="#//api/name/didMessageAttachmentsStatusC
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Attachment status has changed</p>
+				<p>Delegate method will be invoked when message attachment status has changed</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didMessageAttachmentsStatusChanged:(EMMessage *)<em>aMessage</em> error:(EMError *)<em>aError</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)messageAttachmentStatusDidChange:(EMMessage *)<em>aMessage</em> error:(EMError *)<em>aError</em></code></div>
 
 		    
 			
@@ -503,7 +503,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessage</code></th>
-						<td><p>Message whose attachment status changed</p></td>
+						<td><p>Message attachment status has changed</p></td>
 					</tr>
 				
 					<tr>
@@ -522,7 +522,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Attachment status has changed</p>
+				<p>Delegate method will be invoked when message attachment status has changed</p>
 			</div>
 			
 
@@ -554,7 +554,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/EMChatroomManagerDelegate.html b/HyphenateSDK/doc/Protocols/EMChatroomManagerDelegate.html
index a4ad02d..5a945e9 100644
--- a/HyphenateSDK/doc/Protocols/EMChatroomManagerDelegate.html
+++ b/HyphenateSDK/doc/Protocols/EMChatroomManagerDelegate.html
@@ -60,11 +60,11 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/didReceiveKickedFromChatroom:reason:">- didReceiveKickedFromChatroom:reason:</option>
+		<option value="//api/name/didDismissFromChatroom:reason:">- didDismissFromChatroom:reason:</option>
 		
-		<option value="//api/name/didReceiveUserJoinedChatroom:username:">- didReceiveUserJoinedChatroom:username:</option>
+		<option value="//api/name/userDidJoinChatroom:user:">- userDidJoinChatroom:user:</option>
 		
-		<option value="//api/name/didReceiveUserLeavedChatroom:username:">- didReceiveUserLeavedChatroom:username:</option>
+		<option value="//api/name/userDidLeaveChatroom:user:">- userDidLeaveChatroom:user:</option>
 		
 	</optgroup>
 	
@@ -116,8 +116,8 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/didReceiveUserJoinedChatroom:username:" title="didReceiveUserJoinedChatroom:username:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveUserJoinedChatroom:username:">&ndash;&nbsp;didReceiveUserJoinedChatroom:username:</a></code>
+	<a name="//api/name/userDidJoinChatroom:user:" title="userDidJoinChatroom:user:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/userDidJoinChatroom:user:">&ndash;&nbsp;userDidJoinChatroom:user:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -127,12 +127,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveUserJoinedChatroom
 			
 			
 			<div class="method-subsection brief-description">
-				<p>A user joined chatroom</p>
+				<p>Delegate method will be invoked when a user joins a chatroom.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveUserJoinedChatroom:(EMChatroom *)<em>aChatroom</em> username:(NSString *)<em>aUsername</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)userDidJoinChatroom:(EMChatroom *)<em>aChatroom</em> user:(NSString *)<em>aUsername</em></code></div>
 
 		    
 			
@@ -161,7 +161,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>A user joined chatroom</p>
+				<p>Delegate method will be invoked when a user joins a chatroom.</p>
 			</div>
 			
 
@@ -179,8 +179,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveUserLeavedChatroom:username:" title="didReceiveUserLeavedChatroom:username:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveUserLeavedChatroom:username:">&ndash;&nbsp;didReceiveUserLeavedChatroom:username:</a></code>
+	<a name="//api/name/userDidLeaveChatroom:user:" title="userDidLeaveChatroom:user:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/userDidLeaveChatroom:user:">&ndash;&nbsp;userDidLeaveChatroom:user:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -190,12 +190,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveUserLeavedChatroom
 			
 			
 			<div class="method-subsection brief-description">
-				<p>A user leaved chatroom</p>
+				<p>Delegate method will be invoked when a user leaves a chatroom.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveUserLeavedChatroom:(EMChatroom *)<em>aChatroom</em> username:(NSString *)<em>aUsername</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)userDidLeaveChatroom:(EMChatroom *)<em>aChatroom</em> user:(NSString *)<em>aUsername</em></code></div>
 
 		    
 			
@@ -205,7 +205,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aChatroom</code></th>
-						<td><p>Leaved chatroom</p></td>
+						<td><p>Left chatroom</p></td>
 					</tr>
 				
 					<tr>
@@ -224,7 +224,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>A user leaved chatroom</p>
+				<p>Delegate method will be invoked when a user leaves a chatroom.</p>
 			</div>
 			
 
@@ -242,8 +242,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveKickedFromChatroom:reason:" title="didReceiveKickedFromChatroom:reason:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveKickedFromChatroom:reason:">&ndash;&nbsp;didReceiveKickedFromChatroom:reason:</a></code>
+	<a name="//api/name/didDismissFromChatroom:reason:" title="didDismissFromChatroom:reason:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/didDismissFromChatroom:reason:">&ndash;&nbsp;didDismissFromChatroom:reason:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -253,12 +253,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveKickedFromChatroom
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User was kicked out from a chatroom</p>
+				<p>Delegate method will be invoked when a user is dismissed from a chat room</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveKickedFromChatroom:(EMChatroom *)<em>aChatroom</em> reason:(EMChatroomBeKickedReason)<em>aReason</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)didDismissFromChatroom:(EMChatroom *)<em>aChatroom</em> reason:(EMChatroomBeKickedReason)<em>aReason</em></code></div>
 
 		    
 			
@@ -268,12 +268,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aChatroom</code></th>
-						<td><p>The chatroom which user was kicked out from</p></td>
+						<td><p>aChatroom</p></td>
 					</tr>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aReason</code></th>
-						<td><p>The reason of user was kicked out</p></td>
+						<td><p>The reason of dismissing user from the chat room</p></td>
 					</tr>
 				
 				</table>
@@ -287,7 +287,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User was kicked out from a chatroom</p>
+				<p>Delegate method will be invoked when a user is dismissed from a chat room</p>
 			</div>
 			
 
@@ -319,7 +319,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/EMClientDelegate.html b/HyphenateSDK/doc/Protocols/EMClientDelegate.html
index b82388d..07e56c8 100644
--- a/HyphenateSDK/doc/Protocols/EMClientDelegate.html
+++ b/HyphenateSDK/doc/Protocols/EMClientDelegate.html
@@ -60,13 +60,13 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/didAutoLoginWithError:">- didAutoLoginWithError:</option>
+		<option value="//api/name/autoLoginDidCompleteWithError:">- autoLoginDidCompleteWithError:</option>
 		
-		<option value="//api/name/didConnectionStateChanged:">- didConnectionStateChanged:</option>
+		<option value="//api/name/connectionStateDidChange:">- connectionStateDidChange:</option>
 		
-		<option value="//api/name/didLoginFromOtherDevice">- didLoginFromOtherDevice</option>
+		<option value="//api/name/userAccountDidLoginFromOtherDevice">- userAccountDidLoginFromOtherDevice</option>
 		
-		<option value="//api/name/didRemovedFromServer">- didRemovedFromServer</option>
+		<option value="//api/name/userAccountDidRemoveFromServer">- userAccountDidRemoveFromServer</option>
 		
 	</optgroup>
 	
@@ -112,8 +112,8 @@ <h1 class="title">EMClientDelegate Protocol Reference</h1>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/didConnectionStateChanged:" title="didConnectionStateChanged:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didConnectionStateChanged:">&ndash;&nbsp;didConnectionStateChanged:</a></code>
+	<a name="//api/name/connectionStateDidChange:" title="connectionStateDidChange:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/connectionStateDidChange:">&ndash;&nbsp;connectionStateDidChange:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -123,12 +123,12 @@ <h3 class="method-title"><code><a href="#//api/name/didConnectionStateChanged:">
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Connection to the server status changes will receive the callback</p>
+				<p>Delegate method will be invoked when server connection state has changed</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didConnectionStateChanged:(EMConnectionState)<em>aConnectionState</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)connectionStateDidChange:(EMConnectionState)<em>aConnectionState</em></code></div>
 
 		    
 			
@@ -152,11 +152,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Connection to the server status changes will receive the callback</p>
-
-<p>calling the method causes:
-1. After successful login, the phone can not access
-2. After a successful login, network status change</p>
+				<p>Delegate method will be invoked when server connection state has changed</p>
 			</div>
 			
 
@@ -174,8 +170,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didAutoLoginWithError:" title="didAutoLoginWithError:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didAutoLoginWithError:">&ndash;&nbsp;didAutoLoginWithError:</a></code>
+	<a name="//api/name/autoLoginDidCompleteWithError:" title="autoLoginDidCompleteWithError:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/autoLoginDidCompleteWithError:">&ndash;&nbsp;autoLoginDidCompleteWithError:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -185,12 +181,12 @@ <h3 class="method-title"><code><a href="#//api/name/didAutoLoginWithError:">&nda
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Callback Automatic login fails</p>
+				<p>Delegate method will be invoked when auto login is completed</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didAutoLoginWithError:(EMError *)<em>aError</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)autoLoginDidCompleteWithError:(EMError *)<em>aError</em></code></div>
 
 		    
 			
@@ -214,7 +210,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Callback Automatic login fails</p>
+				<p>Delegate method will be invoked when auto login is completed</p>
 			</div>
 			
 
@@ -232,8 +228,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didLoginFromOtherDevice" title="didLoginFromOtherDevice"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didLoginFromOtherDevice">&ndash;&nbsp;didLoginFromOtherDevice</a></code>
+	<a name="//api/name/userAccountDidLoginFromOtherDevice" title="userAccountDidLoginFromOtherDevice"></a>
+	<h3 class="method-title"><code><a href="#//api/name/userAccountDidLoginFromOtherDevice">&ndash;&nbsp;userAccountDidLoginFromOtherDevice</a></code>
 </h3>
 
 	<div class="method-info">
@@ -243,12 +239,12 @@ <h3 class="method-title"><code><a href="#//api/name/didLoginFromOtherDevice">&nd
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Current login account to log in on other devices will receive the callback</p>
+				<p>Delegate method will be invoked when current IM account logged into another device</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didLoginFromOtherDevice</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)userAccountDidLoginFromOtherDevice</code></div>
 
 		    
 			
@@ -260,7 +256,7 @@ <h3 class="method-title"><code><a href="#//api/name/didLoginFromOtherDevice">&nd
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Current login account to log in on other devices will receive the callback</p>
+				<p>Delegate method will be invoked when current IM account logged into another device</p>
 			</div>
 			
 
@@ -278,8 +274,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didRemovedFromServer" title="didRemovedFromServer"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didRemovedFromServer">&ndash;&nbsp;didRemovedFromServer</a></code>
+	<a name="//api/name/userAccountDidRemoveFromServer" title="userAccountDidRemoveFromServer"></a>
+	<h3 class="method-title"><code><a href="#//api/name/userAccountDidRemoveFromServer">&ndash;&nbsp;userAccountDidRemoveFromServer</a></code>
 </h3>
 
 	<div class="method-info">
@@ -289,12 +285,12 @@ <h3 class="method-title"><code><a href="#//api/name/didRemovedFromServer">&ndash
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Current login account will receive the callback is deleted from the server</p>
+				<p>Delegate method will be invoked when current IM account is removed from server</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didRemovedFromServer</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)userAccountDidRemoveFromServer</code></div>
 
 		    
 			
@@ -306,7 +302,7 @@ <h3 class="method-title"><code><a href="#//api/name/didRemovedFromServer">&ndash
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Current login account will receive the callback is deleted from the server</p>
+				<p>Delegate method will be invoked when current IM account is removed from server</p>
 			</div>
 			
 
@@ -338,7 +334,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/EMContactManagerDelegate.html b/HyphenateSDK/doc/Protocols/EMContactManagerDelegate.html
index 6a3b2df..73e114c 100644
--- a/HyphenateSDK/doc/Protocols/EMContactManagerDelegate.html
+++ b/HyphenateSDK/doc/Protocols/EMContactManagerDelegate.html
@@ -60,15 +60,15 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/didReceiveAddedFromUsername:">- didReceiveAddedFromUsername:</option>
+		<option value="//api/name/friendRequestDidApproveByUser:">- friendRequestDidApproveByUser:</option>
 		
-		<option value="//api/name/didReceiveAgreedFromUsername:">- didReceiveAgreedFromUsername:</option>
+		<option value="//api/name/friendRequestDidDeclineByUser:">- friendRequestDidDeclineByUser:</option>
 		
-		<option value="//api/name/didReceiveDeclinedFromUsername:">- didReceiveDeclinedFromUsername:</option>
+		<option value="//api/name/friendRequestDidReceiveFromUser:message:">- friendRequestDidReceiveFromUser:message:</option>
 		
-		<option value="//api/name/didReceiveDeletedFromUsername:">- didReceiveDeletedFromUsername:</option>
+		<option value="//api/name/friendshipDidAddByUser:">- friendshipDidAddByUser:</option>
 		
-		<option value="//api/name/didReceiveFriendInvitationFromUsername:message:">- didReceiveFriendInvitationFromUsername:message:</option>
+		<option value="//api/name/friendshipDidRemoveByUser:">- friendshipDidRemoveByUser:</option>
 		
 	</optgroup>
 	
@@ -120,8 +120,8 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/didReceiveAgreedFromUsername:" title="didReceiveAgreedFromUsername:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveAgreedFromUsername:">&ndash;&nbsp;didReceiveAgreedFromUsername:</a></code>
+	<a name="//api/name/friendRequestDidApproveByUser:" title="friendRequestDidApproveByUser:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/friendRequestDidApproveByUser:">&ndash;&nbsp;friendRequestDidApproveByUser:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -131,12 +131,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveAgreedFromUsername
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after user B agreed user A&rsquo;s add-friend invitation</p>
+				<p>Delegate method will be invoked is a friend request is approved.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveAgreedFromUsername:(NSString *)<em>aUsername</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)friendRequestDidApproveByUser:(NSString *)<em>aUsername</em></code></div>
 
 		    
 			
@@ -146,7 +146,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>User B</p></td>
+						<td><p>User who approves the friend&rsquo;s request</p></td>
 					</tr>
 				
 				</table>
@@ -160,7 +160,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after user B agreed user A&rsquo;s add-friend invitation</p>
+				<p>Delegate method will be invoked is a friend request is approved.</p>
+
+<p>User A will receive this callback after user B approved user A&rsquo;s friend request</p>
 			</div>
 			
 
@@ -178,8 +180,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveDeclinedFromUsername:" title="didReceiveDeclinedFromUsername:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveDeclinedFromUsername:">&ndash;&nbsp;didReceiveDeclinedFromUsername:</a></code>
+	<a name="//api/name/friendRequestDidDeclineByUser:" title="friendRequestDidDeclineByUser:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/friendRequestDidDeclineByUser:">&ndash;&nbsp;friendRequestDidDeclineByUser:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -189,12 +191,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveDeclinedFromUserna
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after user B declined user A&rsquo;s add-friend invitation</p>
+				<p>Delegate method will be invoked if a friend request is declined.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveDeclinedFromUsername:(NSString *)<em>aUsername</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)friendRequestDidDeclineByUser:(NSString *)<em>aUsername</em></code></div>
 
 		    
 			
@@ -204,7 +206,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>User B</p></td>
+						<td><p>User who declined the friend&rsquo;s request</p></td>
 					</tr>
 				
 				</table>
@@ -218,7 +220,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after user B declined user A&rsquo;s add-friend invitation</p>
+				<p>Delegate method will be invoked if a friend request is declined.</p>
+
+<p>User A will receive this callback after user B declined user A&rsquo;s friend request</p>
 			</div>
 			
 
@@ -236,8 +240,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveDeletedFromUsername:" title="didReceiveDeletedFromUsername:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveDeletedFromUsername:">&ndash;&nbsp;didReceiveDeletedFromUsername:</a></code>
+	<a name="//api/name/friendshipDidRemoveByUser:" title="friendshipDidRemoveByUser:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/friendshipDidRemoveByUser:">&ndash;&nbsp;friendshipDidRemoveByUser:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -247,27 +251,22 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveDeletedFromUsernam
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after User B delete the friend relationship between user A</p>
+				<ul>
+<li>Delegate method will be invoked if user is removed as a contact by another user
+*</li>
+<li>User A will receive this callback after User B unfriended with user A
+*</li>
+<li>@param aUsername   User who unfriended the cureent user</li>
+</ul>
+
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveDeletedFromUsername:(NSString *)<em>aUsername</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)friendshipDidRemoveByUser:(NSString *)<em>aUsername</em></code></div>
 
 		    
 			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>User B</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
 
 			
 
@@ -276,7 +275,14 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after User B delete the friend relationship between user A</p>
+				<ul>
+<li>Delegate method will be invoked if user is removed as a contact by another user
+*</li>
+<li>User A will receive this callback after User B unfriended with user A
+*</li>
+<li>@param aUsername   User who unfriended the cureent user</li>
+</ul>
+
 			</div>
 			
 
@@ -294,8 +300,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveAddedFromUsername:" title="didReceiveAddedFromUsername:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveAddedFromUsername:">&ndash;&nbsp;didReceiveAddedFromUsername:</a></code>
+	<a name="//api/name/friendshipDidAddByUser:" title="friendshipDidAddByUser:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/friendshipDidAddByUser:">&ndash;&nbsp;friendshipDidAddByUser:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -305,12 +311,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveAddedFromUsername:
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Both user A and B will receive this callback after User B agreed user A&rsquo;s add-friend invitation</p>
+				<p>Delegate method will be invoked id the user is added as a contact by another user.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveAddedFromUsername:(NSString *)<em>aUsername</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)friendshipDidAddByUser:(NSString *)<em>aUsername</em></code></div>
 
 		    
 			
@@ -334,7 +340,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Both user A and B will receive this callback after User B agreed user A&rsquo;s add-friend invitation</p>
+				<p>Delegate method will be invoked id the user is added as a contact by another user.</p>
+
+<p>Both user A and B will receive this callback after User B agreed user A&rsquo;s add-friend invitation</p>
 			</div>
 			
 
@@ -352,8 +360,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveFriendInvitationFromUsername:message:" title="didReceiveFriendInvitationFromUsername:message:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveFriendInvitationFromUsername:message:">&ndash;&nbsp;didReceiveFriendInvitationFromUsername:message:</a></code>
+	<a name="//api/name/friendRequestDidReceiveFromUser:message:" title="friendRequestDidReceiveFromUser:message:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/friendRequestDidReceiveFromUser:message:">&ndash;&nbsp;friendRequestDidReceiveFromUser:message:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -363,12 +371,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveFriendInvitationFr
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after user B requested to add user A as a friend</p>
+				<p>Delegate method will be invoked when user receives a friend request</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveFriendInvitationFromUsername:(NSString *)<em>aUsername</em> message:(NSString *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)friendRequestDidReceiveFromUser:(NSString *)<em>aUsername</em> message:(NSString *)<em>aMessage</em></code></div>
 
 		    
 			
@@ -378,12 +386,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>User B</p></td>
+						<td><p>Friend request sender</p></td>
 					</tr>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessage</code></th>
-						<td><p>Friend invitation message</p></td>
+						<td><p>Friend request message</p></td>
 					</tr>
 				
 				</table>
@@ -397,7 +405,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after user B requested to add user A as a friend</p>
+				<p>Delegate method will be invoked when user receives a friend request</p>
+
+<p>User A will receive this callback when receiving a friend request from user B</p>
 			</div>
 			
 
@@ -429,7 +439,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/EMGroupManagerDelegate.html b/HyphenateSDK/doc/Protocols/EMGroupManagerDelegate.html
index b6c890e..bd6760c 100644
--- a/HyphenateSDK/doc/Protocols/EMGroupManagerDelegate.html
+++ b/HyphenateSDK/doc/Protocols/EMGroupManagerDelegate.html
@@ -60,23 +60,23 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/didJoinedGroup:inviter:message:">- didJoinedGroup:inviter:message:</option>
+		<option value="//api/name/didJoinGroup:inviter:message:">- didJoinGroup:inviter:message:</option>
 		
-		<option value="//api/name/didReceiveAcceptedGroupInvitation:invitee:">- didReceiveAcceptedGroupInvitation:invitee:</option>
+		<option value="//api/name/didLeaveGroup:reason:">- didLeaveGroup:reason:</option>
 		
-		<option value="//api/name/didReceiveAcceptedJoinGroup:">- didReceiveAcceptedJoinGroup:</option>
+		<option value="//api/name/groupInvitationDidAccept:invitee:">- groupInvitationDidAccept:invitee:</option>
 		
-		<option value="//api/name/didReceiveDeclinedGroupInvitation:invitee:reason:">- didReceiveDeclinedGroupInvitation:invitee:reason:</option>
+		<option value="//api/name/groupInvitationDidDecline:invitee:reason:">- groupInvitationDidDecline:invitee:reason:</option>
 		
-		<option value="//api/name/didReceiveDeclinedJoinGroup:reason:">- didReceiveDeclinedJoinGroup:reason:</option>
+		<option value="//api/name/groupInvitationDidReceive:inviter:message:">- groupInvitationDidReceive:inviter:message:</option>
 		
-		<option value="//api/name/didReceiveGroupInvitation:inviter:message:">- didReceiveGroupInvitation:inviter:message:</option>
+		<option value="//api/name/groupListDidUpdate:">- groupListDidUpdate:</option>
 		
-		<option value="//api/name/didReceiveJoinGroupApplication:applicant:reason:">- didReceiveJoinGroupApplication:applicant:reason:</option>
+		<option value="//api/name/joinGroupRequestDidApprove:">- joinGroupRequestDidApprove:</option>
 		
-		<option value="//api/name/didReceiveLeavedGroup:reason:">- didReceiveLeavedGroup:reason:</option>
+		<option value="//api/name/joinGroupRequestDidDecline:reason:">- joinGroupRequestDidDecline:reason:</option>
 		
-		<option value="//api/name/didUpdateGroupList:">- didUpdateGroupList:</option>
+		<option value="//api/name/joinGroupRequestDidReceive:user:reason:">- joinGroupRequestDidReceive:user:reason:</option>
 		
 	</optgroup>
 	
@@ -112,7 +112,7 @@ <h1 class="title">EMGroupManagerDelegate Protocol Reference</h1>
 					<div class="section section-overview">
 						<a title="Overview" name="overview"></a>
 						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Callbacks of group</p>
+						<p>Delegate</p>
 					</div>
 					
 					
@@ -128,8 +128,8 @@ <h2 class="subtitle subtitle-overview">Overview</h2>
 
 						<div class="task-list">
 							<div class="section-method">
-	<a name="//api/name/didReceiveGroupInvitation:inviter:message:" title="didReceiveGroupInvitation:inviter:message:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveGroupInvitation:inviter:message:">&ndash;&nbsp;didReceiveGroupInvitation:inviter:message:</a></code>
+	<a name="//api/name/groupInvitationDidReceive:inviter:message:" title="groupInvitationDidReceive:inviter:message:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/groupInvitationDidReceive:inviter:message:">&ndash;&nbsp;groupInvitationDidReceive:inviter:message:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -139,12 +139,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveGroupInvitation:in
 			
 			
 			<div class="method-subsection brief-description">
-				<p>After user A invites user B into the group, user B will receive this callback</p>
+				<p>Delegate method will be invoked when receiving a group invitation</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveGroupInvitation:(NSString *)<em>aGroupId</em> inviter:(NSString *)<em>aInviter</em> message:(NSString *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)groupInvitationDidReceive:(NSString *)<em>aGroupId</em> inviter:(NSString *)<em>aInviter</em> message:(NSString *)<em>aMessage</em></code></div>
 
 		    
 			
@@ -164,7 +164,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessage</code></th>
-						<td><p>Invite message</p></td>
+						<td><p>Invitation message</p></td>
 					</tr>
 				
 				</table>
@@ -178,7 +178,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>After user A invites user B into the group, user B will receive this callback</p>
+				<p>Delegate method will be invoked when receiving a group invitation</p>
+
+<p>After user A invites user B into the group, user B will receive this callback</p>
 			</div>
 			
 
@@ -196,8 +198,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveAcceptedGroupInvitation:invitee:" title="didReceiveAcceptedGroupInvitation:invitee:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveAcceptedGroupInvitation:invitee:">&ndash;&nbsp;didReceiveAcceptedGroupInvitation:invitee:</a></code>
+	<a name="//api/name/groupInvitationDidAccept:invitee:" title="groupInvitationDidAccept:invitee:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/groupInvitationDidAccept:invitee:">&ndash;&nbsp;groupInvitationDidAccept:invitee:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -207,12 +209,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveAcceptedGroupInvit
 			
 			
 			<div class="method-subsection brief-description">
-				<p>After user B accepted user A‘s group invitation, user A will receive this callback</p>
+				<p>Delegate method will be invoked when the group invitation is accepted</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveAcceptedGroupInvitation:(EMGroup *)<em>aGroup</em> invitee:(NSString *)<em>aInvitee</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)groupInvitationDidAccept:(EMGroup *)<em>aGroup</em> invitee:(NSString *)<em>aInvitee</em></code></div>
 
 		    
 			
@@ -241,7 +243,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>After user B accepted user A‘s group invitation, user A will receive this callback</p>
+				<p>Delegate method will be invoked when the group invitation is accepted</p>
+
+<p>After user B accepted user A‘s group invitation, user A will receive this callback</p>
 			</div>
 			
 
@@ -259,8 +263,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveDeclinedGroupInvitation:invitee:reason:" title="didReceiveDeclinedGroupInvitation:invitee:reason:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveDeclinedGroupInvitation:invitee:reason:">&ndash;&nbsp;didReceiveDeclinedGroupInvitation:invitee:reason:</a></code>
+	<a name="//api/name/groupInvitationDidDecline:invitee:reason:" title="groupInvitationDidDecline:invitee:reason:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/groupInvitationDidDecline:invitee:reason:">&ndash;&nbsp;groupInvitationDidDecline:invitee:reason:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -270,12 +274,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveDeclinedGroupInvit
 			
 			
 			<div class="method-subsection brief-description">
-				<p>After user B declined user A&rsquo;s group invitation, user A will receive the callback</p>
+				<p>Delegate method will be invoked when the group invitation is decliend.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveDeclinedGroupInvitation:(EMGroup *)<em>aGroup</em> invitee:(NSString *)<em>aInvitee</em> reason:(NSString *)<em>aReason</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)groupInvitationDidDecline:(EMGroup *)<em>aGroup</em> invitee:(NSString *)<em>aInvitee</em> reason:(NSString *)<em>aReason</em></code></div>
 
 		    
 			
@@ -309,7 +313,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>After user B declined user A&rsquo;s group invitation, user A will receive the callback</p>
+				<p>Delegate method will be invoked when the group invitation is decliend.</p>
+
+<p>After user B declined user A&rsquo;s group invitation, user A will receive the callback</p>
 			</div>
 			
 
@@ -327,8 +333,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didJoinedGroup:inviter:message:" title="didJoinedGroup:inviter:message:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didJoinedGroup:inviter:message:">&ndash;&nbsp;didJoinedGroup:inviter:message:</a></code>
+	<a name="//api/name/didJoinGroup:inviter:message:" title="didJoinGroup:inviter:message:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/didJoinGroup:inviter:message:">&ndash;&nbsp;didJoinGroup:inviter:message:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -338,12 +344,12 @@ <h3 class="method-title"><code><a href="#//api/name/didJoinedGroup:inviter:messa
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User B will receive this callback after SDK automatically accept user A&rsquo;s group invitation, need set EMOptions&rsquo;s isAutoAcceptGroupInvitation property to YES</p>
+				<p>Delegate method will be invoked after SDK automatically accepted the group invitation</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didJoinedGroup:(EMGroup *)<em>aGroup</em> inviter:(NSString *)<em>aInviter</em> message:(NSString *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)didJoinGroup:(EMGroup *)<em>aGroup</em> inviter:(NSString *)<em>aInviter</em> message:(NSString *)<em>aMessage</em></code></div>
 
 		    
 			
@@ -353,7 +359,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aGroup</code></th>
-						<td><p>Group</p></td>
+						<td><p>Group instance</p></td>
 					</tr>
 				
 					<tr>
@@ -377,7 +383,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User B will receive this callback after SDK automatically accept user A&rsquo;s group invitation, need set EMOptions&rsquo;s isAutoAcceptGroupInvitation property to YES</p>
+				<p>Delegate method will be invoked after SDK automatically accepted the group invitation</p>
+
+<p>User B will receive this callback after SDK automatically accept user A&rsquo;s group invitation, need set EMOptions&rsquo;s isAutoAcceptGroupInvitation property to YES</p>
 			</div>
 			
 
@@ -395,8 +403,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveLeavedGroup:reason:" title="didReceiveLeavedGroup:reason:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveLeavedGroup:reason:">&ndash;&nbsp;didReceiveLeavedGroup:reason:</a></code>
+	<a name="//api/name/didLeaveGroup:reason:" title="didLeaveGroup:reason:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/didLeaveGroup:reason:">&ndash;&nbsp;didLeaveGroup:reason:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -406,12 +414,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveLeavedGroup:reason
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Callback of leave group</p>
+				<p>Delegate method will be invoked when user leaves a group</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveLeavedGroup:(EMGroup *)<em>aGroup</em> reason:(EMGroupLeaveReason)<em>aReason</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)didLeaveGroup:(EMGroup *)<em>aGroup</em> reason:(EMGroupLeaveReason)<em>aReason</em></code></div>
 
 		    
 			
@@ -440,7 +448,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Callback of leave group</p>
+				<p>Delegate method will be invoked when user leaves a group</p>
 			</div>
 			
 
@@ -458,8 +466,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveJoinGroupApplication:applicant:reason:" title="didReceiveJoinGroupApplication:applicant:reason:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveJoinGroupApplication:applicant:reason:">&ndash;&nbsp;didReceiveJoinGroupApplication:applicant:reason:</a></code>
+	<a name="//api/name/joinGroupRequestDidReceive:user:reason:" title="joinGroupRequestDidReceive:user:reason:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/joinGroupRequestDidReceive:user:reason:">&ndash;&nbsp;joinGroupRequestDidReceive:user:reason:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -469,12 +477,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveJoinGroupApplicati
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group&rsquo;s owner receive user&rsquo;s applicaton of joining group, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
+				<p>Delegate method will be invoked when the group owner receives a group request and group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveJoinGroupApplication:(EMGroup *)<em>aGroup</em> applicant:(NSString *)<em>aApplicant</em> reason:(NSString *)<em>aReason</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)joinGroupRequestDidReceive:(EMGroup *)<em>aGroup</em> user:(NSString *)<em>aUsername</em> reason:(NSString *)<em>aReason</em></code></div>
 
 		    
 			
@@ -484,17 +492,17 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aGroup</code></th>
-						<td><p>Group</p></td>
+						<td><p>Group instance</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aApplicant</code></th>
-						<td><p>The applicant</p></td>
+						<th scope="row" class="argument-name"><code>aUsername</code></th>
+						<td><p>The user initialized the group join request</p></td>
 					</tr>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aReason</code></th>
-						<td><p>The applicant&rsquo;s message</p></td>
+						<td><p>The user&rsquo;s message</p></td>
 					</tr>
 				
 				</table>
@@ -508,7 +516,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group&rsquo;s owner receive user&rsquo;s applicaton of joining group, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
+				<p>Delegate method will be invoked when the group owner receives a group request and group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
 			</div>
 			
 
@@ -526,8 +534,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveDeclinedJoinGroup:reason:" title="didReceiveDeclinedJoinGroup:reason:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveDeclinedJoinGroup:reason:">&ndash;&nbsp;didReceiveDeclinedJoinGroup:reason:</a></code>
+	<a name="//api/name/joinGroupRequestDidDecline:reason:" title="joinGroupRequestDidDecline:reason:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/joinGroupRequestDidDecline:reason:">&ndash;&nbsp;joinGroupRequestDidDecline:reason:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -537,12 +545,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveDeclinedJoinGroup:
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after group&rsquo;s owner declined it&rsquo;s application, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
+				<p>Delegate method will be invoked when the group owner declines a join group request</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveDeclinedJoinGroup:(NSString *)<em>aGroupId</em> reason:(NSString *)<em>aReason</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)joinGroupRequestDidDecline:(NSString *)<em>aGroupId</em> reason:(NSString *)<em>aReason</em></code></div>
 
 		    
 			
@@ -571,7 +579,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after group&rsquo;s owner declined it&rsquo;s application, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
+				<p>Delegate method will be invoked when the group owner declines a join group request</p>
+
+<p>User A will receive this callback after group&rsquo;s owner declined the group request, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
 			</div>
 			
 
@@ -589,8 +599,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didReceiveAcceptedJoinGroup:" title="didReceiveAcceptedJoinGroup:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didReceiveAcceptedJoinGroup:">&ndash;&nbsp;didReceiveAcceptedJoinGroup:</a></code>
+	<a name="//api/name/joinGroupRequestDidApprove:" title="joinGroupRequestDidApprove:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/joinGroupRequestDidApprove:">&ndash;&nbsp;joinGroupRequestDidApprove:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -600,12 +610,12 @@ <h3 class="method-title"><code><a href="#//api/name/didReceiveAcceptedJoinGroup:
 			
 			
 			<div class="method-subsection brief-description">
-				<p>User A will receive this callback after group&rsquo;s owner accepted it&rsquo;s application, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
+				<p>Delegate method will be invoked when the group owner approves a join group request</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didReceiveAcceptedJoinGroup:(EMGroup *)<em>aGroup</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)joinGroupRequestDidApprove:(EMGroup *)<em>aGroup</em></code></div>
 
 		    
 			
@@ -629,7 +639,9 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>User A will receive this callback after group&rsquo;s owner accepted it&rsquo;s application, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
+				<p>Delegate method will be invoked when the group owner approves a join group request</p>
+
+<p>User A will receive this callback after group&rsquo;s owner approve the group request, group&rsquo;s style is EMGroupStylePublicJoinNeedApproval</p>
 			</div>
 			
 
@@ -647,8 +659,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/didUpdateGroupList:" title="didUpdateGroupList:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/didUpdateGroupList:">&ndash;&nbsp;didUpdateGroupList:</a></code>
+	<a name="//api/name/groupListDidUpdate:" title="groupListDidUpdate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/groupListDidUpdate:">&ndash;&nbsp;groupListDidUpdate:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -658,12 +670,12 @@ <h3 class="method-title"><code><a href="#//api/name/didUpdateGroupList:">&ndash;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Group List changed</p>
+				<p>Group List updated</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)didUpdateGroupList:(NSArray *)<em>aGroupList</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)groupListDidUpdate:(NSArray *)<em>aGroupList</em></code></div>
 
 		    
 			
@@ -687,7 +699,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Group List changed</p>
+				<p>Group List updated</p>
 			</div>
 			
 
@@ -719,7 +731,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/IEMCallManager.html b/HyphenateSDK/doc/Protocols/IEMCallManager.html
index 6995c90..28efa37 100644
--- a/HyphenateSDK/doc/Protocols/IEMCallManager.html
+++ b/HyphenateSDK/doc/Protocols/IEMCallManager.html
@@ -60,33 +60,29 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
+		<option value="//api/name/addDelegate:">- addDelegate:</option>
+		
 		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
 		
 		<option value="//api/name/answerIncomingCall:">- answerIncomingCall:</option>
 		
-		<option value="//api/name/endCall:reason:">- endCall:reason:</option>
-		
-		<option value="//api/name/makeVideoCall:error:">- makeVideoCall:error:</option>
+		<option value="//api/name/enableAdaptiveBirateStreaming:">- enableAdaptiveBirateStreaming:</option>
 		
-		<option value="//api/name/makeVoiceCall:error:">- makeVoiceCall:error:</option>
-		
-		<option value="//api/name/markCallSession:isSilence:">- markCallSession:isSilence:</option>
-		
-		<option value="//api/name/pauseVideoTransfer:">- pauseVideoTransfer:</option>
+		<option value="//api/name/endCall:reason:">- endCall:reason:</option>
 		
-		<option value="//api/name/pauseVoiceAndVideoTransfer:">- pauseVoiceAndVideoTransfer:</option>
+		<option value="//api/name/pauseVideoWithSession:error:">- pauseVideoWithSession:error:</option>
 		
-		<option value="//api/name/pauseVoiceTransfer:">- pauseVoiceTransfer:</option>
+		<option value="//api/name/pauseVoiceWithSession:error:">- pauseVoiceWithSession:error:</option>
 		
 		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
 		
-		<option value="//api/name/resumeVideoTransfer:">- resumeVideoTransfer:</option>
+		<option value="//api/name/resumeVideoWithSession:error:">- resumeVideoWithSession:error:</option>
 		
-		<option value="//api/name/resumeVoiceAndVideoTransfer:">- resumeVoiceAndVideoTransfer:</option>
+		<option value="//api/name/resumeVoiceWithSession:error:">- resumeVoiceWithSession:error:</option>
 		
-		<option value="//api/name/resumeVoiceTransfer:">- resumeVoiceTransfer:</option>
+		<option value="//api/name/startVideoCall:completion:">- startVideoCall:completion:</option>
 		
-		<option value="//api/name/setVideoAdaptive:">- setVideoAdaptive:</option>
+		<option value="//api/name/startVoiceCall:completion:">- startVoiceCall:completion:</option>
 		
 	</optgroup>
 	
@@ -195,8 +191,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
+	<a name="//api/name/addDelegate:" title="addDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addDelegate:">&ndash;&nbsp;addDelegate:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -206,12 +202,12 @@ <h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id&lt;EMCallManagerDelegate&gt;)<em>aDelegate</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addDelegate:(id&lt;EMCallManagerDelegate&gt;)<em>aDelegate</em></code></div>
 
 		    
 			
@@ -235,7 +231,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 
@@ -253,8 +249,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/answerIncomingCall:" title="answerIncomingCall:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/answerIncomingCall:">&ndash;&nbsp;answerIncomingCall:</a></code>
+	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -264,12 +260,12 @@ <h3 class="method-title"><code><a href="#//api/name/answerIncomingCall:">&ndash;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Receiver answer the call</p>
+				<p>Remove delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (EMError *)answerIncomingCall:(NSString *)<em>aSessionId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id&lt;EMCallManagerDelegate&gt;)<em>aDelegate</em></code></div>
 
 		    
 			
@@ -278,8 +274,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSessionId</code></th>
-						<td><p>Session Id</p></td>
+						<th scope="row" class="argument-name"><code>aDelegate</code></th>
+						<td><p>Delegate</p></td>
 					</tr>
 				
 				</table>
@@ -287,18 +283,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Error</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Receiver answer the call</p>
+				<p>Remove delegate</p>
 			</div>
 			
 
@@ -316,8 +307,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/endCall:reason:" title="endCall:reason:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/endCall:reason:">&ndash;&nbsp;endCall:reason:</a></code>
+	<a name="//api/name/answerIncomingCall:" title="answerIncomingCall:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/answerIncomingCall:">&ndash;&nbsp;answerIncomingCall:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -327,12 +318,12 @@ <h3 class="method-title"><code><a href="#//api/name/endCall:reason:">&ndash;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>End the call</p>
+				<p>Recipient answer the incoming call</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)endCall:(NSString *)<em>aSessionId</em> reason:(EMCallEndReason)<em>aReason</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (EMError *)answerIncomingCall:(NSString *)<em>aSessionId</em></code></div>
 
 		    
 			
@@ -342,12 +333,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aSessionId</code></th>
-						<td><p>Session ID</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aReason</code></th>
-						<td><p>End reason</p></td>
+						<td><p>Session Id</p></td>
 					</tr>
 				
 				</table>
@@ -355,13 +341,18 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
+			<div class="method-subsection return">
+				<h4 class="method-subtitle parameter-title">Return Value</h4>
+				<p>Error</p>
+			</div>
+			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>End the call</p>
+				<p>Recipient answer the incoming call</p>
 			</div>
 			
 
@@ -379,8 +370,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/makeVoiceCall:error:" title="makeVoiceCall:error:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/makeVoiceCall:error:">&ndash;&nbsp;makeVoiceCall:error:</a></code>
+	<a name="//api/name/endCall:reason:" title="endCall:reason:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/endCall:reason:">&ndash;&nbsp;endCall:reason:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -390,12 +381,12 @@ <h3 class="method-title"><code><a href="#//api/name/makeVoiceCall:error:">&ndash
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Start a voice call session</p>
+				<p>End the call</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (EMCallSession *)makeVoiceCall:(NSString *)<em>aUsername</em> error:(EMError **)<em>pError</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)endCall:(NSString *)<em>aSessionId</em> reason:(EMCallEndReason)<em>aReason</em></code></div>
 
 		    
 			
@@ -404,13 +395,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The callee</p></td>
+						<th scope="row" class="argument-name"><code>aSessionId</code></th>
+						<td><p>Session ID</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>pError</code></th>
-						<td><p>Error</p></td>
+						<th scope="row" class="argument-name"><code>aReason</code></th>
+						<td><p>End reason</p></td>
 					</tr>
 				
 				</table>
@@ -418,18 +409,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Session instance</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Start a voice call session</p>
+				<p>End the call</p>
 			</div>
 			
 
@@ -447,8 +433,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/markCallSession:isSilence:" title="markCallSession:isSilence:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/markCallSession:isSilence:">&ndash;&nbsp;markCallSession:isSilence:</a></code>
+	<a name="//api/name/startVoiceCall:completion:" title="startVoiceCall:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/startVoiceCall:completion:">&ndash;&nbsp;startVoiceCall:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -458,12 +444,12 @@ <h3 class="method-title"><code><a href="#//api/name/markCallSession:isSilence:">
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get video package lost rate</p>
+				<p>Start a voice call</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (EMError *)markCallSession:(NSString *)<em>aSessionId</em> isSilence:(BOOL)<em>aIsSilence</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)startVoiceCall:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( EMCallSession *aCallSession , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -472,13 +458,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSessionId</code></th>
-						<td><p>Session ID</p></td>
+						<th scope="row" class="argument-name"><code>aUsername</code></th>
+						<td><p>The callee</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aIsSilence</code></th>
-						<td><p>Is Silence</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback of completion</p></td>
 					</tr>
 				
 				</table>
@@ -486,18 +472,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Error</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get video package lost rate</p>
+				<p>Start a voice call</p>
 			</div>
 			
 
@@ -515,8 +496,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/pauseVoiceTransfer:" title="pauseVoiceTransfer:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/pauseVoiceTransfer:">&ndash;&nbsp;pauseVoiceTransfer:</a></code>
+	<a name="//api/name/pauseVoiceWithSession:error:" title="pauseVoiceWithSession:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/pauseVoiceWithSession:error:">&ndash;&nbsp;pauseVoiceWithSession:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -526,12 +507,12 @@ <h3 class="method-title"><code><a href="#//api/name/pauseVoiceTransfer:">&ndash;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Suspend voice data transmission</p>
+				<p>Pause voice streaming</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)pauseVoiceTransfer:(NSString *)<em>aSessionId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)pauseVoiceWithSession:(NSString *)<em>aSessionId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -555,7 +536,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Suspend voice data transmission</p>
+				<p>Pause voice streaming</p>
 			</div>
 			
 
@@ -573,8 +554,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/resumeVoiceTransfer:" title="resumeVoiceTransfer:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/resumeVoiceTransfer:">&ndash;&nbsp;resumeVoiceTransfer:</a></code>
+	<a name="//api/name/resumeVoiceWithSession:error:" title="resumeVoiceWithSession:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/resumeVoiceWithSession:error:">&ndash;&nbsp;resumeVoiceWithSession:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -584,12 +565,12 @@ <h3 class="method-title"><code><a href="#//api/name/resumeVoiceTransfer:">&ndash
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Resume voice data transmission</p>
+				<p>Resume voice streaming</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)resumeVoiceTransfer:(NSString *)<em>aSessionId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)resumeVoiceWithSession:(NSString *)<em>aSessionId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -613,7 +594,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Resume voice data transmission</p>
+				<p>Resume voice streaming</p>
 			</div>
 			
 
@@ -631,8 +612,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/makeVideoCall:error:" title="makeVideoCall:error:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/makeVideoCall:error:">&ndash;&nbsp;makeVideoCall:error:</a></code>
+	<a name="//api/name/startVideoCall:completion:" title="startVideoCall:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/startVideoCall:completion:">&ndash;&nbsp;startVideoCall:completion:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -642,12 +623,12 @@ <h3 class="method-title"><code><a href="#//api/name/makeVideoCall:error:">&ndash
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Start a video call session</p>
+				<p>Start a video call</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (EMCallSession *)makeVideoCall:(NSString *)<em>aUsername</em> error:(EMError **)<em>pError</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)startVideoCall:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( EMCallSession *aCallSession , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -661,129 +642,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>pError</code></th>
-						<td><p>Error</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Session instance</p>
-			</div>
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>Start a video call session</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">IEMCallManager.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div><div class="section-method">
-	<a name="//api/name/pauseVideoTransfer:" title="pauseVideoTransfer:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/pauseVideoTransfer:">&ndash;&nbsp;pauseVideoTransfer:</a></code>
-</h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>Suspend video data transmission</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>- (void)pauseVideoTransfer:(NSString *)<em>aSessionId</em></code></div>
-
-		    
-			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSessionId</code></th>
-						<td><p>Session ID</p></td>
-					</tr>
-				
-				</table>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>Suspend video data transmission</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">IEMCallManager.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div><div class="section-method">
-	<a name="//api/name/resumeVideoTransfer:" title="resumeVideoTransfer:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/resumeVideoTransfer:">&ndash;&nbsp;resumeVideoTransfer:</a></code>
-</h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>Resume video data transmission</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>- (void)resumeVideoTransfer:(NSString *)<em>aSessionId</em></code></div>
-
-		    
-			
-			<div class="method-subsection arguments-section parameters">
-				<h4 class="method-subtitle parameter-title">Parameters</h4>
-				<table class="argument-def parameter-def">
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSessionId</code></th>
-						<td><p>Session ID</p></td>
+						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -797,7 +657,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Resume video data transmission</p>
+				<p>Start a video call</p>
 			</div>
 			
 
@@ -815,8 +675,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/pauseVoiceAndVideoTransfer:" title="pauseVoiceAndVideoTransfer:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/pauseVoiceAndVideoTransfer:">&ndash;&nbsp;pauseVoiceAndVideoTransfer:</a></code>
+	<a name="//api/name/pauseVideoWithSession:error:" title="pauseVideoWithSession:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/pauseVideoWithSession:error:">&ndash;&nbsp;pauseVideoWithSession:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -826,12 +686,12 @@ <h3 class="method-title"><code><a href="#//api/name/pauseVoiceAndVideoTransfer:"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Suspend voice and video data transmission</p>
+				<p>Pause video streaming</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)pauseVoiceAndVideoTransfer:(NSString *)<em>aSessionId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)pauseVideoWithSession:(NSString *)<em>aSessionId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -855,7 +715,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Suspend voice and video data transmission</p>
+				<p>Pause video streaming</p>
 			</div>
 			
 
@@ -873,8 +733,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/resumeVoiceAndVideoTransfer:" title="resumeVoiceAndVideoTransfer:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/resumeVoiceAndVideoTransfer:">&ndash;&nbsp;resumeVoiceAndVideoTransfer:</a></code>
+	<a name="//api/name/resumeVideoWithSession:error:" title="resumeVideoWithSession:error:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/resumeVideoWithSession:error:">&ndash;&nbsp;resumeVideoWithSession:error:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -884,12 +744,12 @@ <h3 class="method-title"><code><a href="#//api/name/resumeVoiceAndVideoTransfer:
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Resume voice and video data transmission</p>
+				<p>Resume video streaming</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)resumeVoiceAndVideoTransfer:(NSString *)<em>aSessionId</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)resumeVideoWithSession:(NSString *)<em>aSessionId</em> error:(EMError **)<em>pError</em></code></div>
 
 		    
 			
@@ -913,7 +773,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Resume voice and video data transmission</p>
+				<p>Resume video streaming</p>
 			</div>
 			
 
@@ -931,8 +791,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/setVideoAdaptive:" title="setVideoAdaptive:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/setVideoAdaptive:">&ndash;&nbsp;setVideoAdaptive:</a></code>
+	<a name="//api/name/enableAdaptiveBirateStreaming:" title="enableAdaptiveBirateStreaming:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/enableAdaptiveBirateStreaming:">&ndash;&nbsp;enableAdaptiveBirateStreaming:</a></code>
 </h3>
 
 	<div class="method-info">
@@ -942,12 +802,12 @@ <h3 class="method-title"><code><a href="#//api/name/setVideoAdaptive:">&ndash;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>open or close video adaptive,default is close</p>
+				<p>Enable video adaptive, default is disable</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)setVideoAdaptive:(BOOL)<em>aFlag</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)enableAdaptiveBirateStreaming:(BOOL)<em>isAdaptive</em></code></div>
 
 		    
 			
@@ -956,8 +816,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFlag</code></th>
-						<td><p>YES is open,NO is close</p></td>
+						<th scope="row" class="argument-name"><code>isAdaptive</code></th>
+						<td><p>YES is enable, NO is disable</p></td>
 					</tr>
 				
 				</table>
@@ -971,7 +831,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>open or close video adaptive,default is close</p>
+				<p>Enable video adaptive, default is disable</p>
 			</div>
 			
 
@@ -1003,7 +863,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/IEMChatManager.html b/HyphenateSDK/doc/Protocols/IEMChatManager.html
index 2f766e5..eb87a43 100644
--- a/HyphenateSDK/doc/Protocols/IEMChatManager.html
+++ b/HyphenateSDK/doc/Protocols/IEMChatManager.html
@@ -60,21 +60,17 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
-		
-		<option value="//api/name/asyncDownloadMessageAttachments:progress:completion:">- asyncDownloadMessageAttachments:progress:completion:</option>
-		
-		<option value="//api/name/asyncDownloadMessageThumbnail:progress:completion:">- asyncDownloadMessageThumbnail:progress:completion:</option>
+		<option value="//api/name/addDelegate:">- addDelegate:</option>
 		
-		<option value="//api/name/asyncResendMessage:progress:completion:">- asyncResendMessage:progress:completion:</option>
+		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
 		
-		<option value="//api/name/asyncSendMessage:progress:completion:">- asyncSendMessage:progress:completion:</option>
+		<option value="//api/name/deleteConversation:isDeleteMessages:completion:">- deleteConversation:isDeleteMessages:completion:</option>
 		
-		<option value="//api/name/asyncSendReadAckForMessage:">- asyncSendReadAckForMessage:</option>
+		<option value="//api/name/deleteConversations:isDeleteMessages:completion:">- deleteConversations:isDeleteMessages:completion:</option>
 		
-		<option value="//api/name/deleteConversation:deleteMessages:">- deleteConversation:deleteMessages:</option>
+		<option value="//api/name/downloadMessageAttachment:progress:completion:">- downloadMessageAttachment:progress:completion:</option>
 		
-		<option value="//api/name/deleteConversations:deleteMessages:">- deleteConversations:deleteMessages:</option>
+		<option value="//api/name/downloadMessageThumbnail:progress:completion:">- downloadMessageThumbnail:progress:completion:</option>
 		
 		<option value="//api/name/getAllConversations">- getAllConversations</option>
 		
@@ -82,15 +78,19 @@ <h1 id="library-title">
 		
 		<option value="//api/name/getMessageAttachmentPath:">- getMessageAttachmentPath:</option>
 		
-		<option value="//api/name/importConversations:">- importConversations:</option>
-		
-		<option value="//api/name/importMessages:">- importMessages:</option>
+		<option value="//api/name/importConversations:completion:">- importConversations:completion:</option>
 		
-		<option value="//api/name/loadAllConversationsFromDB">- loadAllConversationsFromDB</option>
+		<option value="//api/name/importMessages:completion:">- importMessages:completion:</option>
 		
 		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
 		
-		<option value="//api/name/updateMessage:">- updateMessage:</option>
+		<option value="//api/name/resendMessage:progress:completion:">- resendMessage:progress:completion:</option>
+		
+		<option value="//api/name/sendMessage:progress:completion:">- sendMessage:progress:completion:</option>
+		
+		<option value="//api/name/sendMessageReadAck:completion:">- sendMessageReadAck:completion:</option>
+		
+		<option value="//api/name/updateMessage:completion:">- updateMessage:completion:</option>
 		
 	</optgroup>
 	
@@ -205,8 +205,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
+	<a name="//api/name/addDelegate:" title="addDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addDelegate:">&ndash;&nbsp;addDelegate:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -216,12 +216,12 @@ <h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id&lt;EMChatManagerDelegate&gt;)<em>aDelegate</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addDelegate:(id&lt;EMChatManagerDelegate&gt;)<em>aDelegate</em></code></div>
 
 		    
 			
@@ -245,7 +245,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 
@@ -263,8 +263,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getAllConversations" title="getAllConversations"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getAllConversations">&ndash;&nbsp;getAllConversations</a></code>
+	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -274,29 +274,36 @@ <h3 class="method-title"><code><a href="#//api/name/getAllConversations">&ndash;
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get all conversations, will load conversations from DB if not exist in memory</p>
+				<p>Remove delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)getAllConversations</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id&lt;EMChatManagerDelegate&gt;)<em>aDelegate</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Conversation list<a href="../Classes/EMConversation.html">EMConversation</a></p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aDelegate</code></th>
+						<td><p>Delegate</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get all conversations, will load conversations from DB if not exist in memory</p>
+				<p>Remove delegate</p>
 			</div>
 			
 
@@ -314,8 +321,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadAllConversationsFromDB" title="loadAllConversationsFromDB"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadAllConversationsFromDB">&ndash;&nbsp;loadAllConversationsFromDB</a></code>
+	<a name="//api/name/getAllConversations" title="getAllConversations"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getAllConversations">&ndash;&nbsp;getAllConversations</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -325,12 +332,12 @@ <h3 class="method-title"><code><a href="#//api/name/loadAllConversationsFromDB">
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Load all conversations from DB, will update conversation list in memory after this method is called</p>
+				<p>Get all conversations, by loading conversations from DB if not exist in memory</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)loadAllConversationsFromDB</code></div>
+			<div class="method-subsection method-declaration"><code>- (NSArray *)getAllConversations</code></div>
 
 		    
 			
@@ -347,9 +354,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Load all conversations from DB, will update conversation list in memory after this method is called</p>
-
-<p>Synchronization method will block the current thread</p>
+				<p>Get all conversations, by loading conversations from DB if not exist in memory</p>
 			</div>
 			
 
@@ -440,8 +445,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/deleteConversation:deleteMessages:" title="deleteConversation:deleteMessages:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/deleteConversation:deleteMessages:">&ndash;&nbsp;deleteConversation:deleteMessages:</a></code>
+	<a name="//api/name/deleteConversation:isDeleteMessages:completion:" title="deleteConversation:isDeleteMessages:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/deleteConversation:isDeleteMessages:completion:">&ndash;&nbsp;deleteConversation:isDeleteMessages:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -456,7 +461,7 @@ <h3 class="method-title"><code><a href="#//api/name/deleteConversation:deleteMes
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)deleteConversation:(NSString *)<em>aConversationId</em> deleteMessages:(BOOL)<em>aDeleteMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)deleteConversation:(NSString *)<em>aConversationId</em> isDeleteMessages:(BOOL)<em>aIsDeleteMessages</em> completion:(void ( ^ ) ( NSString *aConversationId , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -470,7 +475,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aDeleteMessage</code></th>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>isDeleteMessages</code></th>
 						<td><p>Whether delete messages</p></td>
 					</tr>
 				
@@ -479,11 +489,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Whether deleted successfully</p>
-			</div>
-			
 
 			
 
@@ -508,8 +513,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/deleteConversations:deleteMessages:" title="deleteConversations:deleteMessages:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/deleteConversations:deleteMessages:">&ndash;&nbsp;deleteConversations:deleteMessages:</a></code>
+	<a name="//api/name/deleteConversations:isDeleteMessages:completion:" title="deleteConversations:isDeleteMessages:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/deleteConversations:isDeleteMessages:completion:">&ndash;&nbsp;deleteConversations:isDeleteMessages:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -524,7 +529,7 @@ <h3 class="method-title"><code><a href="#//api/name/deleteConversations:deleteMe
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)deleteConversations:(NSArray *)<em>aConversations</em> deleteMessages:(BOOL)<em>aDeleteMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)deleteConversations:(NSArray *)<em>aConversations</em> isDeleteMessages:(BOOL)<em>aIsDeleteMessages</em> completion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -538,20 +543,20 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aDeleteMessage</code></th>
+						<th scope="row" class="argument-name"><code>aIsDeleteMessages</code></th>
 						<td><p>Whether delete messages</p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Whether deleted successfully</p>
-			</div>
-			
 
 			
 
@@ -576,8 +581,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/importConversations:" title="importConversations:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/importConversations:">&ndash;&nbsp;importConversations:</a></code>
+	<a name="//api/name/importConversations:completion:" title="importConversations:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/importConversations:completion:">&ndash;&nbsp;importConversations:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -592,7 +597,7 @@ <h3 class="method-title"><code><a href="#//api/name/importConversations:">&ndash
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)importConversations:(NSArray *)<em>aConversations</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)importConversations:(NSArray *)<em>aConversations</em> completion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -605,16 +610,16 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 						<td><p>Conversation list<a href="../Classes/EMConversation.html">EMConversation</a></p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Whether imported successfully</p>
-			</div>
-			
 
 			
 
@@ -650,7 +655,7 @@ <h3 class="method-title"><code><a href="#//api/name/getMessageAttachmentPath:">&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get message attachment path for the conversation, files in this path will also be deleted when delete the conversation</p>
+				<p>Get message attachment local path for the conversation. Delete the conversation will also delete the files under the file path.</p>
 			</div>
 			
 		    
@@ -684,7 +689,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get message attachment path for the conversation, files in this path will also be deleted when delete the conversation</p>
+				<p>Get message attachment local path for the conversation. Delete the conversation will also delete the files under the file path.</p>
 			</div>
 			
 
@@ -702,8 +707,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/importMessages:" title="importMessages:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/importMessages:">&ndash;&nbsp;importMessages:</a></code>
+	<a name="//api/name/importMessages:completion:" title="importMessages:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/importMessages:completion:">&ndash;&nbsp;importMessages:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -718,7 +723,7 @@ <h3 class="method-title"><code><a href="#//api/name/importMessages:">&ndash;&nbs
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)importMessages:(NSArray *)<em>aMessages</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)importMessages:(NSArray *)<em>aMessages</em> completion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -731,16 +736,16 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 						<td><p>Message list<a href="../Classes/EMMessage.html">EMMessage</a></p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Whether imported successfully</p>
-			</div>
-			
 
 			
 
@@ -765,8 +770,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/updateMessage:" title="updateMessage:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/updateMessage:">&ndash;&nbsp;updateMessage:</a></code>
+	<a name="//api/name/updateMessage:completion:" title="updateMessage:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updateMessage:completion:">&ndash;&nbsp;updateMessage:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -776,12 +781,12 @@ <h3 class="method-title"><code><a href="#//api/name/updateMessage:">&ndash;&nbsp
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Update message to DB</p>
+				<p>Update message</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (BOOL)updateMessage:(EMMessage *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updateMessage:(EMMessage *)<em>aMessage</em> completion:(void ( ^ ) ( EMMessage *aMessage , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -794,23 +799,23 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 						<td><p>Message</p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Whether updated successfully</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Update message to DB</p>
+				<p>Update message</p>
 			</div>
 			
 
@@ -828,8 +833,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncSendReadAckForMessage:" title="asyncSendReadAckForMessage:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncSendReadAckForMessage:">&ndash;&nbsp;asyncSendReadAckForMessage:</a></code>
+	<a name="//api/name/sendMessageReadAck:completion:" title="sendMessageReadAck:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/sendMessageReadAck:completion:">&ndash;&nbsp;sendMessageReadAck:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -839,12 +844,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncSendReadAckForMessage:"
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Send read ack for message</p>
+				<p>Send read acknowledgement for message</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncSendReadAckForMessage:(EMMessage *)<em>aMessage</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)sendMessageReadAck:(EMMessage *)<em>aMessage</em> completion:(void ( ^ ) ( EMMessage *aMessage , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -857,6 +862,11 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 						<td><p>Message instance</p></td>
 					</tr>
 				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
+					</tr>
+				
 				</table>
 			</div>
 			
@@ -868,7 +878,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Send read ack for message</p>
+				<p>Send read acknowledgement for message</p>
 
 <p>Asynchronous methods</p>
 			</div>
@@ -888,8 +898,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncSendMessage:progress:completion:" title="asyncSendMessage:progress:completion:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncSendMessage:progress:completion:">&ndash;&nbsp;asyncSendMessage:progress:completion:</a></code>
+	<a name="//api/name/sendMessage:progress:completion:" title="sendMessage:progress:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/sendMessage:progress:completion:">&ndash;&nbsp;sendMessage:progress:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -904,7 +914,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncSendMessage:progress:co
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncSendMessage:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressCompletion</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletion</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)sendMessage:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressBlock</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -918,7 +928,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aProgressCompletion</code></th>
+						<th scope="row" class="argument-name"><code>aProgressBlock</code></th>
 						<td><p>The block of attachment upload progress</p></td>
 					</tr>
 				
@@ -958,8 +968,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncResendMessage:progress:completion:" title="asyncResendMessage:progress:completion:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncResendMessage:progress:completion:">&ndash;&nbsp;asyncResendMessage:progress:completion:</a></code>
+	<a name="//api/name/resendMessage:progress:completion:" title="resendMessage:progress:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/resendMessage:progress:completion:">&ndash;&nbsp;resendMessage:progress:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -974,7 +984,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncResendMessage:progress:
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncResendMessage:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressCompletion</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletion</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)resendMessage:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressBlock</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -988,7 +998,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aProgressCompletion</code></th>
+						<th scope="row" class="argument-name"><code>aProgressBlock</code></th>
 						<td><p>The callback block of attachment upload progress</p></td>
 					</tr>
 				
@@ -1009,8 +1019,6 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
 				<p>Resend Message</p>
-
-<p>Asynchronous methods</p>
 			</div>
 			
 
@@ -1028,8 +1036,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDownloadMessageThumbnail:progress:completion:" title="asyncDownloadMessageThumbnail:progress:completion:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDownloadMessageThumbnail:progress:completion:">&ndash;&nbsp;asyncDownloadMessageThumbnail:progress:completion:</a></code>
+	<a name="//api/name/downloadMessageThumbnail:progress:completion:" title="downloadMessageThumbnail:progress:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/downloadMessageThumbnail:progress:completion:">&ndash;&nbsp;downloadMessageThumbnail:progress:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1039,12 +1047,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDownloadMessageThumbnai
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Download message thumbnail attachments (thumbnails of image message or first frame of video image), SDK can download thumbail automatically, so user should NOT download thumbail manually except automatic download failed</p>
+				<p>Download message thumbnail (thumbnail of image message or first frame of video image), SDK downloads thumbails automatically, no need to download thumbail manually unless automatic download failed.</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDownloadMessageThumbnail:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressCompletion</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletion</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)downloadMessageThumbnail:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressBlock</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1058,7 +1066,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aProgressCompletion</code></th>
+						<th scope="row" class="argument-name"><code>aProgressBlock</code></th>
 						<td><p>The callback block of attachment download progress</p></td>
 					</tr>
 				
@@ -1078,9 +1086,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Download message thumbnail attachments (thumbnails of image message or first frame of video image), SDK can download thumbail automatically, so user should NOT download thumbail manually except automatic download failed</p>
-
-<p>Asynchronous methods</p>
+				<p>Download message thumbnail (thumbnail of image message or first frame of video image), SDK downloads thumbails automatically, no need to download thumbail manually unless automatic download failed.</p>
 			</div>
 			
 
@@ -1098,8 +1104,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDownloadMessageAttachments:progress:completion:" title="asyncDownloadMessageAttachments:progress:completion:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDownloadMessageAttachments:progress:completion:">&ndash;&nbsp;asyncDownloadMessageAttachments:progress:completion:</a></code>
+	<a name="//api/name/downloadMessageAttachment:progress:completion:" title="downloadMessageAttachment:progress:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/downloadMessageAttachment:progress:completion:">&ndash;&nbsp;downloadMessageAttachment:progress:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1109,12 +1115,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDownloadMessageAttachme
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Download message attachment(voice, video, image or file), SDK can download voice automatically, so user should NOT download voice manually except automatic download failed</p>
+				<p>Download message attachment(voice, video, image or file), SDK downloads attachment automatically, no need to download attachment manually unless automatic download failed</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDownloadMessageAttachments:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressCompletion</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletion</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)downloadMessageAttachment:(EMMessage *)<em>aMessage</em> progress:(void ( ^ ) ( int progress ))<em>aProgressBlock</em> completion:(void ( ^ ) ( EMMessage *message , EMError *error ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1128,7 +1134,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aProgressCompletion</code></th>
+						<th scope="row" class="argument-name"><code>aProgressBlock</code></th>
 						<td><p>The callback block of attachment download progress</p></td>
 					</tr>
 				
@@ -1148,7 +1154,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Download message attachment(voice, video, image or file), SDK can download voice automatically, so user should NOT download voice manually except automatic download failed</p>
+				<p>Download message attachment(voice, video, image or file), SDK downloads attachment automatically, no need to download attachment manually unless automatic download failed</p>
 
 <p>Asynchronous methods</p>
 			</div>
@@ -1182,7 +1188,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/IEMChatroomManager.html b/HyphenateSDK/doc/Protocols/IEMChatroomManager.html
index f858b1e..36548b2 100644
--- a/HyphenateSDK/doc/Protocols/IEMChatroomManager.html
+++ b/HyphenateSDK/doc/Protocols/IEMChatroomManager.html
@@ -60,13 +60,17 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
+		<option value="//api/name/addDelegate:">- addDelegate:</option>
+		
 		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
 		
-		<option value="//api/name/asyncGetAllChatroomsFromServer:failure:">- asyncGetAllChatroomsFromServer:failure:</option>
+		<option value="//api/name/getAllChatroomsFromServerWithCompletion:">- getAllChatroomsFromServerWithCompletion:</option>
+		
+		<option value="//api/name/getChatroomSpecificationFromServerByID:includeMembersList:completion:">- getChatroomSpecificationFromServerByID:includeMembersList:completion:</option>
 		
-		<option value="//api/name/asyncJoinChatroom:success:failure:">- asyncJoinChatroom:success:failure:</option>
+		<option value="//api/name/joinChatroom:completion:">- joinChatroom:completion:</option>
 		
-		<option value="//api/name/asyncLeaveChatroom:success:failure:">- asyncLeaveChatroom:success:failure:</option>
+		<option value="//api/name/leaveChatroom:completion:">- leaveChatroom:completion:</option>
 		
 		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
 		
@@ -174,6 +178,64 @@ <h4 class="method-subtitle">Discussion</h4>
 			
 
 			
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">IEMChatroomManager.h</code></p>
+			</div>
+			
+			
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/addDelegate:" title="addDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addDelegate:">&ndash;&nbsp;addDelegate:</a></code>
+<span class="task-item-suffix">required method</span></h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+			
+			
+			<div class="method-subsection brief-description">
+				<p>Add delegate</p>
+			</div>
+			
+		    
+
+			<div class="method-subsection method-declaration"><code>- (void)addDelegate:(id&lt;EMChatroomManagerDelegate&gt;)<em>aDelegate</em></code></div>
+
+		    
+			
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aDelegate</code></th>
+						<td><p>Delegate</p></td>
+					</tr>
+				
+				</table>
+			</div>
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>Add delegate</p>
+			</div>
+			
+
+			
+
+			
+
+			
 			<div class="method-subsection declared-in-section">
 				<h4 class="method-subtitle">Declared In</h4>
 				<p><code class="declared-in-ref">IEMChatroomManager.h</code></p>
@@ -241,8 +303,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncGetAllChatroomsFromServer:failure:" title="asyncGetAllChatroomsFromServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncGetAllChatroomsFromServer:failure:">&ndash;&nbsp;asyncGetAllChatroomsFromServer:failure:</a></code>
+	<a name="//api/name/getAllChatroomsFromServerWithCompletion:" title="getAllChatroomsFromServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getAllChatroomsFromServerWithCompletion:">&ndash;&nbsp;getAllChatroomsFromServerWithCompletion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -257,7 +319,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncGetAllChatroomsFromServ
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncGetAllChatroomsFromServer:(void ( ^ ) ( NSArray *aList ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getAllChatroomsFromServerWithCompletion:(void ( ^ ) ( NSArray *aList , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -266,13 +328,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -304,8 +361,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncJoinChatroom:success:failure:" title="asyncJoinChatroom:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncJoinChatroom:success:failure:">&ndash;&nbsp;asyncJoinChatroom:success:failure:</a></code>
+	<a name="//api/name/joinChatroom:completion:" title="joinChatroom:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/joinChatroom:completion:">&ndash;&nbsp;joinChatroom:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -320,7 +377,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncJoinChatroom:success:fa
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncJoinChatroom:(NSString *)<em>aChatroomId</em> success:(void ( ^ ) ( EMChatroom *aRoom ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)joinChatroom:(NSString *)<em>aChatroomId</em> completion:(void ( ^ ) ( EMChatroom *aChatroom , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -334,13 +391,71 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
+				</table>
+			</div>
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>Join a chatroom</p>
+			</div>
+			
+
+			
+
+			
+
+			
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">IEMChatroomManager.h</code></p>
+			</div>
+			
+			
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/leaveChatroom:completion:" title="leaveChatroom:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/leaveChatroom:completion:">&ndash;&nbsp;leaveChatroom:completion:</a></code>
+<span class="task-item-suffix">required method</span></h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+			
+			
+			<div class="method-subsection brief-description">
+				<p>Leave a chatroom</p>
+			</div>
+			
+		    
+
+			<div class="method-subsection method-declaration"><code>- (void)leaveChatroom:(NSString *)<em>aChatroomId</em> completion:(void ( ^ ) ( EMChatroom *aChatroom , EMError *aError ))<em>aCompletionBlock</em></code></div>
+
+		    
+			
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aChatroomId</code></th>
+						<td><p>Chatroom id</p></td>
+					</tr>
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -354,7 +469,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Join a chatroom</p>
+				<p>Leave a chatroom</p>
 			</div>
 			
 
@@ -372,8 +487,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncLeaveChatroom:success:failure:" title="asyncLeaveChatroom:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncLeaveChatroom:success:failure:">&ndash;&nbsp;asyncLeaveChatroom:success:failure:</a></code>
+	<a name="//api/name/getChatroomSpecificationFromServerByID:includeMembersList:completion:" title="getChatroomSpecificationFromServerByID:includeMembersList:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getChatroomSpecificationFromServerByID:includeMembersList:completion:">&ndash;&nbsp;getChatroomSpecificationFromServerByID:includeMembersList:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -383,12 +498,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncLeaveChatroom:success:f
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Leave a chatroom</p>
+				<p>Fetch chat room specifications</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncLeaveChatroom:(NSString *)<em>aChatroomId</em> success:(void ( ^ ) ( EMChatroom *aRoom ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getChatroomSpecificationFromServerByID:(NSString *)<em>aChatroomId</em> includeMembersList:(BOOL)<em>aIncludeMembersList</em> completion:(void ( ^ ) ( EMChatroom *aChatroom , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -402,13 +517,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<th scope="row" class="argument-name"><code>aIncludeMembersList</code></th>
+						<td><p>Whether to get member list</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -416,18 +531,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 
 			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Leaved chatroom</p>
-			</div>
-			
 
 			
 
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Leave a chatroom</p>
+				<p>Fetch chat room specifications</p>
 			</div>
 			
 
@@ -459,7 +569,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/IEMContactManager.html b/HyphenateSDK/doc/Protocols/IEMContactManager.html
index 053de03..9e88fe9 100644
--- a/HyphenateSDK/doc/Protocols/IEMContactManager.html
+++ b/HyphenateSDK/doc/Protocols/IEMContactManager.html
@@ -60,34 +60,32 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
-		
-		<option value="//api/name/asyncAcceptInvitationForUsername:success:failure:">- asyncAcceptInvitationForUsername:success:failure:</option>
+		<option value="//api/name/addContact:message:completion:">- addContact:message:completion:</option>
 		
-		<option value="//api/name/asyncAddContact:message:success:failure:">- asyncAddContact:message:success:failure:</option>
+		<option value="//api/name/addDelegate:">- addDelegate:</option>
 		
-		<option value="//api/name/asyncAddUserToBlackList:relationshipBoth:success:failure:">- asyncAddUserToBlackList:relationshipBoth:success:failure:</option>
-		
-		<option value="//api/name/asyncDeclineInvitationForUsername:success:failure:">- asyncDeclineInvitationForUsername:success:failure:</option>
+		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
 		
-		<option value="//api/name/asyncDeleteContact:success:failure:">- asyncDeleteContact:success:failure:</option>
+		<option value="//api/name/addUserToBlackList:completion:">- addUserToBlackList:completion:</option>
 		
-		<option value="//api/name/asyncGetBlackListFromServer:failure:">- asyncGetBlackListFromServer:failure:</option>
+		<option value="//api/name/approveFriendRequestFromUser:completion:">- approveFriendRequestFromUser:completion:</option>
 		
-		<option value="//api/name/asyncGetContactsFromServer:failure:">- asyncGetContactsFromServer:failure:</option>
+		<option value="//api/name/declineFriendRequestFromUser:completion:">- declineFriendRequestFromUser:completion:</option>
 		
-		<option value="//api/name/asyncRemoveUserFromBlackList:success:failure:">- asyncRemoveUserFromBlackList:success:failure:</option>
+		<option value="//api/name/deleteContact:completion:">- deleteContact:completion:</option>
 		
 		<option value="//api/name/getBlackList">- getBlackList</option>
 		
-		<option value="//api/name/getBlackListFromDB">- getBlackListFromDB</option>
+		<option value="//api/name/getBlackListFromServerWithCompletion:">- getBlackListFromServerWithCompletion:</option>
 		
 		<option value="//api/name/getContacts">- getContacts</option>
 		
-		<option value="//api/name/getContactsFromDB">- getContactsFromDB</option>
+		<option value="//api/name/getContactsFromServerWithCompletion:">- getContactsFromServerWithCompletion:</option>
 		
 		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
 		
+		<option value="//api/name/removeUserFromBlackList:completion:">- removeUserFromBlackList:completion:</option>
+		
 	</optgroup>
 	
 	
@@ -122,7 +120,7 @@ <h1 class="title">IEMContactManager Protocol Reference</h1>
 					<div class="section section-overview">
 						<a title="Overview" name="overview"></a>
 						<h2 class="subtitle subtitle-overview">Overview</h2>
-						<p>Operations of contact</p>
+						<p>Contact Management</p>
 					</div>
 					
 					
@@ -201,8 +199,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
+	<a name="//api/name/addDelegate:" title="addDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addDelegate:">&ndash;&nbsp;addDelegate:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -212,12 +210,12 @@ <h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id)<em>aDelegate</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addDelegate:(id&lt;EMContactManagerDelegate&gt;)<em>aDelegate</em></code></div>
 
 		    
 			
@@ -241,7 +239,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 
@@ -259,8 +257,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getContacts" title="getContacts"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getContacts">&ndash;&nbsp;getContacts</a></code>
+	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -270,29 +268,36 @@ <h3 class="method-title"><code><a href="#//api/name/getContacts">&ndash;&nbsp;ge
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get all friends from memory</p>
+				<p>Remove delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)getContacts</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id)<em>aDelegate</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Contact list<a href="../Classes/EMGroup.html">EMGroup</a></p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aDelegate</code></th>
+						<td><p>Delegate</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get all friends from memory</p>
+				<p>Remove delegate</p>
 			</div>
 			
 
@@ -310,8 +315,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getContactsFromDB" title="getContactsFromDB"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getContactsFromDB">&ndash;&nbsp;getContactsFromDB</a></code>
+	<a name="//api/name/getContacts" title="getContacts"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getContacts">&ndash;&nbsp;getContacts</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -321,12 +326,12 @@ <h3 class="method-title"><code><a href="#//api/name/getContactsFromDB">&ndash;&n
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get all the friends from the DB</p>
+				<p>Get all contacts</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)getContactsFromDB</code></div>
+			<div class="method-subsection method-declaration"><code>- (NSArray *)getContacts</code></div>
 
 		    
 			
@@ -334,7 +339,7 @@ <h3 class="method-title"><code><a href="#//api/name/getContactsFromDB">&ndash;&n
 			
 			<div class="method-subsection return">
 				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Contact list<NSString></p>
+				<p>Contact list<a href="../Classes/EMGroup.html">EMGroup</a></p>
 			</div>
 			
 
@@ -343,7 +348,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get all the friends from the DB</p>
+				<p>Get all contacts</p>
 			</div>
 			
 
@@ -372,7 +377,7 @@ <h3 class="method-title"><code><a href="#//api/name/getBlackList">&ndash;&nbsp;g
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get the blacklist from memory</p>
+				<p>Get the blacklist of blocked users</p>
 			</div>
 			
 		    
@@ -394,7 +399,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get the blacklist from memory</p>
+				<p>Get the blacklist of blocked users</p>
 			</div>
 			
 
@@ -412,8 +417,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getBlackListFromDB" title="getBlackListFromDB"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getBlackListFromDB">&ndash;&nbsp;getBlackListFromDB</a></code>
+	<a name="//api/name/getContactsFromServerWithCompletion:" title="getContactsFromServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getContactsFromServerWithCompletion:">&ndash;&nbsp;getContactsFromServerWithCompletion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -423,63 +428,12 @@ <h3 class="method-title"><code><a href="#//api/name/getBlackListFromDB">&ndash;&
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get the blacklist from the DB</p>
+				<p>Get all contacts from the server</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)getBlackListFromDB</code></div>
-
-		    
-			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Blacklist<NSString></p>
-			</div>
-			
-
-			
-
-			
-			<div class="method-subsection discussion-section">
-				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get the blacklist from the DB</p>
-			</div>
-			
-
-			
-
-			
-
-			
-			<div class="method-subsection declared-in-section">
-				<h4 class="method-subtitle">Declared In</h4>
-				<p><code class="declared-in-ref">IEMContactManager.h</code></p>
-			</div>
-			
-			
-		</div>
-	</div>
-</div><div class="section-method">
-	<a name="//api/name/asyncGetContactsFromServer:failure:" title="asyncGetContactsFromServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncGetContactsFromServer:failure:">&ndash;&nbsp;asyncGetContactsFromServer:failure:</a></code>
-<span class="task-item-suffix">required method</span></h3>
-
-	<div class="method-info">
-		<div class="pointy-thing"></div>
-
-		<div class="method-info-container">
-			
-			
-			<div class="method-subsection brief-description">
-				<p>Get all the friends from the server</p>
-			</div>
-			
-		    
-
-			<div class="method-subsection method-declaration"><code>- (void)asyncGetContactsFromServer:(void ( ^ ) ( NSArray *aList ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getContactsFromServerWithCompletion:(void ( ^ ) ( NSArray *aList , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -488,13 +442,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -508,7 +457,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get all the friends from the server</p>
+				<p>Get all contacts from the server</p>
 			</div>
 			
 
@@ -526,8 +475,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncAddContact:message:success:failure:" title="asyncAddContact:message:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncAddContact:message:success:failure:">&ndash;&nbsp;asyncAddContact:message:success:failure:</a></code>
+	<a name="//api/name/addContact:message:completion:" title="addContact:message:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addContact:message:completion:">&ndash;&nbsp;addContact:message:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -542,7 +491,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncAddContact:message:succ
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncAddContact:(NSString *)<em>aUsername</em> message:(NSString *)<em>aMessage</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addContact:(NSString *)<em>aUsername</em> message:(NSString *)<em>aMessage</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -552,22 +501,17 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The user to add</p></td>
+						<td><p>The user to be added</p></td>
 					</tr>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aMessage</code></th>
-						<td><p>Friend invitation message</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<td><p>Friend request message</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -599,8 +543,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDeleteContact:success:failure:" title="asyncDeleteContact:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDeleteContact:success:failure:">&ndash;&nbsp;asyncDeleteContact:success:failure:</a></code>
+	<a name="//api/name/deleteContact:completion:" title="deleteContact:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/deleteContact:completion:">&ndash;&nbsp;deleteContact:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -610,12 +554,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDeleteContact:success:f
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Delete friend</p>
+				<p>Delete a contact</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDeleteContact:(NSString *)<em>aUsername</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)deleteContact:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -625,17 +569,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The user to delete</p></td>
+						<td><p>The user to be deleted</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -649,7 +588,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Delete friend</p>
+				<p>Delete a contact</p>
 			</div>
 			
 
@@ -667,8 +606,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncGetBlackListFromServer:failure:" title="asyncGetBlackListFromServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncGetBlackListFromServer:failure:">&ndash;&nbsp;asyncGetBlackListFromServer:failure:</a></code>
+	<a name="//api/name/getBlackListFromServerWithCompletion:" title="getBlackListFromServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getBlackListFromServerWithCompletion:">&ndash;&nbsp;getBlackListFromServerWithCompletion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -683,7 +622,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncGetBlackListFromServer:
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncGetBlackListFromServer:(void ( ^ ) ( NSArray *aList ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getBlackListFromServerWithCompletion:(void ( ^ ) ( NSArray *aList , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -692,13 +631,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -730,8 +664,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncAddUserToBlackList:relationshipBoth:success:failure:" title="asyncAddUserToBlackList:relationshipBoth:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncAddUserToBlackList:relationshipBoth:success:failure:">&ndash;&nbsp;asyncAddUserToBlackList:relationshipBoth:success:failure:</a></code>
+	<a name="//api/name/addUserToBlackList:completion:" title="addUserToBlackList:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addUserToBlackList:completion:">&ndash;&nbsp;addUserToBlackList:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -741,12 +675,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncAddUserToBlackList:rela
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Add user to blacklist</p>
+				<p>Add a user to blacklist</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncAddUserToBlackList:(NSString *)<em>aUsername</em> relationshipBoth:(BOOL)<em>aBoth</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addUserToBlackList:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -756,22 +690,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The user to add</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aBoth</code></th>
-						<td><p>Whether block messages from me to the user which is added to the black list</p></td>
+						<td><p>Block user</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -785,7 +709,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Add user to blacklist</p>
+				<p>Add a user to blacklist</p>
 			</div>
 			
 
@@ -803,8 +727,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncRemoveUserFromBlackList:success:failure:" title="asyncRemoveUserFromBlackList:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncRemoveUserFromBlackList:success:failure:">&ndash;&nbsp;asyncRemoveUserFromBlackList:success:failure:</a></code>
+	<a name="//api/name/removeUserFromBlackList:completion:" title="removeUserFromBlackList:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/removeUserFromBlackList:completion:">&ndash;&nbsp;removeUserFromBlackList:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -814,12 +738,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncRemoveUserFromBlackList
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove user from blacklist</p>
+				<p>Remove a user from blacklist</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncRemoveUserFromBlackList:(NSString *)<em>aUsername</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)removeUserFromBlackList:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -829,17 +753,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The user to remove from blacklist</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<td><p>Unblock user</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -853,7 +772,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove user from blacklist</p>
+				<p>Remove a user from blacklist</p>
 			</div>
 			
 
@@ -871,8 +790,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncAcceptInvitationForUsername:success:failure:" title="asyncAcceptInvitationForUsername:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncAcceptInvitationForUsername:success:failure:">&ndash;&nbsp;asyncAcceptInvitationForUsername:success:failure:</a></code>
+	<a name="//api/name/approveFriendRequestFromUser:completion:" title="approveFriendRequestFromUser:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/approveFriendRequestFromUser:completion:">&ndash;&nbsp;approveFriendRequestFromUser:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -882,12 +801,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncAcceptInvitationForUser
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Agree invitation</p>
+				<p>Apporove a friend request</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncAcceptInvitationForUsername:(NSString *)<em>aUsername</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)approveFriendRequestFromUser:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -897,17 +816,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>Applicants</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<td><p>User who initiated the friend request</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -921,7 +835,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Agree invitation</p>
+				<p>Apporove a friend request</p>
 			</div>
 			
 
@@ -939,8 +853,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDeclineInvitationForUsername:success:failure:" title="asyncDeclineInvitationForUsername:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDeclineInvitationForUsername:success:failure:">&ndash;&nbsp;asyncDeclineInvitationForUsername:success:failure:</a></code>
+	<a name="//api/name/declineFriendRequestFromUser:completion:" title="declineFriendRequestFromUser:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/declineFriendRequestFromUser:completion:">&ndash;&nbsp;declineFriendRequestFromUser:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -950,12 +864,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDeclineInvitationForUse
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Decline invitation</p>
+				<p>Decline a friend request</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDeclineInvitationForUsername:(NSString *)<em>aUsername</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)declineFriendRequestFromUser:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( NSString *aUsername , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -965,17 +879,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>Applicants</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<td><p>User who initiated the friend request</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -989,7 +898,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Decline invitation</p>
+				<p>Decline a friend request</p>
 			</div>
 			
 
@@ -1021,7 +930,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/Protocols/IEMGroupManager.html b/HyphenateSDK/doc/Protocols/IEMGroupManager.html
index f505210..856ca87 100644
--- a/HyphenateSDK/doc/Protocols/IEMGroupManager.html
+++ b/HyphenateSDK/doc/Protocols/IEMGroupManager.html
@@ -60,61 +60,61 @@ <h1 id="library-title">
 	
 	<optgroup label="Instance Methods">
 		
-		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
+		<option value="//api/name/acceptInvitationFromGroup:inviter:completion:">- acceptInvitationFromGroup:inviter:completion:</option>
 		
-		<option value="//api/name/asyncAcceptInvitationFromGroup:inviter:success:failure:">- asyncAcceptInvitationFromGroup:inviter:success:failure:</option>
+		<option value="//api/name/addDelegate:">- addDelegate:</option>
 		
-		<option value="//api/name/asyncAcceptJoinApplication:applicant:success:failure:">- asyncAcceptJoinApplication:applicant:success:failure:</option>
+		<option value="//api/name/addDelegate:delegateQueue:">- addDelegate:delegateQueue:</option>
 		
-		<option value="//api/name/asyncAddOccupants:toGroup:welcomeMessage:success:failure:">- asyncAddOccupants:toGroup:welcomeMessage:success:failure:</option>
+		<option value="//api/name/addMembers:toGroup:message:completion:">- addMembers:toGroup:message:completion:</option>
 		
-		<option value="//api/name/asyncApplyJoinPublicGroup:message:success:failure:">- asyncApplyJoinPublicGroup:message:success:failure:</option>
+		<option value="//api/name/approveJoinGroupRequest:sender:completion:">- approveJoinGroupRequest:sender:completion:</option>
 		
-		<option value="//api/name/asyncBlockGroup:success:failure:">- asyncBlockGroup:success:failure:</option>
+		<option value="//api/name/blockGroup:completion:">- blockGroup:completion:</option>
 		
-		<option value="//api/name/asyncBlockOccupants:fromGroup:success:failure:">- asyncBlockOccupants:fromGroup:success:failure:</option>
+		<option value="//api/name/blockMembers:fromGroup:completion:">- blockMembers:fromGroup:completion:</option>
 		
-		<option value="//api/name/asyncChangeDescription:forGroup:success:failure:">- asyncChangeDescription:forGroup:success:failure:</option>
+		<option value="//api/name/createGroupWithSubject:description:invitees:message:setting:completion:">- createGroupWithSubject:description:invitees:message:setting:completion:</option>
 		
-		<option value="//api/name/asyncChangeGroupSubject:forGroup:success:failure:">- asyncChangeGroupSubject:forGroup:success:failure:</option>
+		<option value="//api/name/declineGroupInvitation:inviter:reason:completion:">- declineGroupInvitation:inviter:reason:completion:</option>
 		
-		<option value="//api/name/asyncCreateGroupWithSubject:description:invitees:message:setting:success:failure:">- asyncCreateGroupWithSubject:description:invitees:message:setting:success:failure:</option>
+		<option value="//api/name/declineJoinGroupRequest:sender:reason:completion:">- declineJoinGroupRequest:sender:reason:completion:</option>
 		
-		<option value="//api/name/asyncDeclineInvitationFromGroup:inviter:reason:success:failure:">- asyncDeclineInvitationFromGroup:inviter:reason:success:failure:</option>
+		<option value="//api/name/destroyGroup:completion:">- destroyGroup:completion:</option>
 		
-		<option value="//api/name/asyncDeclineJoinApplication:applicant:reason:success:failure:">- asyncDeclineJoinApplication:applicant:reason:success:failure:</option>
+		<option value="//api/name/getGroupBlackListFromServerByID:completion:">- getGroupBlackListFromServerByID:completion:</option>
 		
-		<option value="//api/name/asyncDestroyGroup:success:failure:">- asyncDestroyGroup:success:failure:</option>
+		<option value="//api/name/getGroupSpecificationFromServerByID:includeMembersList:completion:">- getGroupSpecificationFromServerByID:includeMembersList:completion:</option>
 		
-		<option value="//api/name/asyncFetchGroupBansList:success:failure:">- asyncFetchGroupBansList:success:failure:</option>
+		<option value="//api/name/getGroupsWithoutPushNotification:">- getGroupsWithoutPushNotification:</option>
 		
-		<option value="//api/name/asyncFetchGroupInfo:includeMembersList:success:failure:">- asyncFetchGroupInfo:includeMembersList:success:failure:</option>
+		<option value="//api/name/getJoinedGroups">- getJoinedGroups</option>
 		
-		<option value="//api/name/asyncGetMyGroupsFromServer:failure:">- asyncGetMyGroupsFromServer:failure:</option>
+		<option value="//api/name/getJoinedGroupsFromServerWithCompletion:">- getJoinedGroupsFromServerWithCompletion:</option>
 		
-		<option value="//api/name/asyncGetPublicGroupsFromServerWithCursor:pageSize:success:failure:">- asyncGetPublicGroupsFromServerWithCursor:pageSize:success:failure:</option>
+		<option value="//api/name/getPublicGroupsFromServerWithCursor:pageSize:completion:">- getPublicGroupsFromServerWithCursor:pageSize:completion:</option>
 		
-		<option value="//api/name/asyncIgnoreGroupPush:ignore:success:failure:">- asyncIgnoreGroupPush:ignore:success:failure:</option>
+		<option value="//api/name/joinPublicGroup:completion:">- joinPublicGroup:completion:</option>
 		
-		<option value="//api/name/asyncJoinPublicGroup:success:failure:">- asyncJoinPublicGroup:success:failure:</option>
+		<option value="//api/name/leaveGroup:completion:">- leaveGroup:completion:</option>
 		
-		<option value="//api/name/asyncLeaveGroup:success:failure:">- asyncLeaveGroup:success:failure:</option>
+		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
 		
-		<option value="//api/name/asyncRemoveOccupants:fromGroup:success:failure:">- asyncRemoveOccupants:fromGroup:success:failure:</option>
+		<option value="//api/name/removeMembers:fromGroup:completion:">- removeMembers:fromGroup:completion:</option>
 		
-		<option value="//api/name/asyncSearchPublicGroupWithId:success:failure:">- asyncSearchPublicGroupWithId:success:failure:</option>
+		<option value="//api/name/requestToJoinPublicGroup:message:completion:">- requestToJoinPublicGroup:message:completion:</option>
 		
-		<option value="//api/name/asyncUnblockGroup:success:failure:">- asyncUnblockGroup:success:failure:</option>
+		<option value="//api/name/searchPublicGroupWithId:completion:">- searchPublicGroupWithId:completion:</option>
 		
-		<option value="//api/name/asyncUnblockOccupants:forGroup:success:failure:">- asyncUnblockOccupants:forGroup:success:failure:</option>
+		<option value="//api/name/unblockGroup:completion:">- unblockGroup:completion:</option>
 		
-		<option value="//api/name/getAllGroups">- getAllGroups</option>
+		<option value="//api/name/unblockMembers:fromGroup:completion:">- unblockMembers:fromGroup:completion:</option>
 		
-		<option value="//api/name/getAllIgnoredGroupIds">- getAllIgnoredGroupIds</option>
+		<option value="//api/name/updateDescription:forGroup:completion:">- updateDescription:forGroup:completion:</option>
 		
-		<option value="//api/name/loadAllMyGroupsFromDB">- loadAllMyGroupsFromDB</option>
+		<option value="//api/name/updateGroupSubject:forGroup:completion:">- updateGroupSubject:forGroup:completion:</option>
 		
-		<option value="//api/name/removeDelegate:">- removeDelegate:</option>
+		<option value="//api/name/updatePushServiceForGroup:isPushEnabled:completion:">- updatePushServiceForGroup:isPushEnabled:completion:</option>
 		
 	</optgroup>
 	
@@ -229,8 +229,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
+	<a name="//api/name/addDelegate:" title="addDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addDelegate:">&ndash;&nbsp;addDelegate:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -240,12 +240,12 @@ <h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbs
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id)<em>aDelegate</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addDelegate:(id&lt;EMGroupManagerDelegate&gt;)<em>aDelegate</em></code></div>
 
 		    
 			
@@ -269,7 +269,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove delegate</p>
+				<p>Add delegate</p>
 			</div>
 			
 
@@ -287,8 +287,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getAllGroups" title="getAllGroups"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getAllGroups">&ndash;&nbsp;getAllGroups</a></code>
+	<a name="//api/name/removeDelegate:" title="removeDelegate:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/removeDelegate:">&ndash;&nbsp;removeDelegate:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -298,29 +298,36 @@ <h3 class="method-title"><code><a href="#//api/name/getAllGroups">&ndash;&nbsp;g
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get all groups, will load from DB if not exist in memory</p>
+				<p>Remove delegate</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)getAllGroups</code></div>
+			<div class="method-subsection method-declaration"><code>- (void)removeDelegate:(id)<em>aDelegate</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Group list<a href="../Classes/EMGroup.html">EMGroup</a></p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>aDelegate</code></th>
+						<td><p>Delegate</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get all groups, will load from DB if not exist in memory</p>
+				<p>Remove delegate</p>
 			</div>
 			
 
@@ -338,8 +345,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/loadAllMyGroupsFromDB" title="loadAllMyGroupsFromDB"></a>
-	<h3 class="method-title"><code><a href="#//api/name/loadAllMyGroupsFromDB">&ndash;&nbsp;loadAllMyGroupsFromDB</a></code>
+	<a name="//api/name/getJoinedGroups" title="getJoinedGroups"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getJoinedGroups">&ndash;&nbsp;getJoinedGroups</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -349,12 +356,12 @@ <h3 class="method-title"><code><a href="#//api/name/loadAllMyGroupsFromDB">&ndas
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Load all groups from DB, will update group list in memory after loading</p>
+				<p>Get all groups</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)loadAllMyGroupsFromDB</code></div>
+			<div class="method-subsection method-declaration"><code>- (NSArray *)getJoinedGroups</code></div>
 
 		    
 			
@@ -371,7 +378,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Load all groups from DB, will update group list in memory after loading</p>
+				<p>Get all groups</p>
 			</div>
 			
 
@@ -389,8 +396,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/getAllIgnoredGroupIds" title="getAllIgnoredGroupIds"></a>
-	<h3 class="method-title"><code><a href="#//api/name/getAllIgnoredGroupIds">&ndash;&nbsp;getAllIgnoredGroupIds</a></code>
+	<a name="//api/name/getGroupsWithoutPushNotification:" title="getGroupsWithoutPushNotification:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getGroupsWithoutPushNotification:">&ndash;&nbsp;getGroupsWithoutPushNotification:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -400,29 +407,36 @@ <h3 class="method-title"><code><a href="#//api/name/getAllIgnoredGroupIds">&ndas
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get ID list of groups which block push from memory</p>
+				<p>Get the list of groups which have disabled Apple Push Notification Service</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (NSArray *)getAllIgnoredGroupIds</code></div>
+			<div class="method-subsection method-declaration"><code>- (NSArray *)getGroupsWithoutPushNotification:(EMError **)<em>pError</em></code></div>
 
 		    
 			
-
-			
-			<div class="method-subsection return">
-				<h4 class="method-subtitle parameter-title">Return Value</h4>
-				<p>Group id list<NSString></p>
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+				
+					<tr>
+						<th scope="row" class="argument-name"><code>pError</code></th>
+						<td><p>Error</p></td>
+					</tr>
+				
+				</table>
 			</div>
 			
 
 			
 
 			
+
+			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get ID list of groups which block push from memory</p>
+				<p>Get the list of groups which have disabled Apple Push Notification Service</p>
 			</div>
 			
 
@@ -440,8 +454,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncGetMyGroupsFromServer:failure:" title="asyncGetMyGroupsFromServer:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncGetMyGroupsFromServer:failure:">&ndash;&nbsp;asyncGetMyGroupsFromServer:failure:</a></code>
+	<a name="//api/name/getJoinedGroupsFromServerWithCompletion:" title="getJoinedGroupsFromServerWithCompletion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getJoinedGroupsFromServerWithCompletion:">&ndash;&nbsp;getJoinedGroupsFromServerWithCompletion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -451,12 +465,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncGetMyGroupsFromServer:f
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get all of user&rsquo;s groups from server, will update group list in memory and DB after success</p>
+				<p>Get all of user&rsquo;s groups from server</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncGetMyGroupsFromServer:(void ( ^ ) ( NSArray *aList ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getJoinedGroupsFromServerWithCompletion:(void ( ^ ) ( NSArray *aList , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -465,13 +479,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -485,7 +494,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get all of user&rsquo;s groups from server, will update group list in memory and DB after success</p>
+				<p>Get all of user&rsquo;s groups from server</p>
 			</div>
 			
 
@@ -503,8 +512,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncGetPublicGroupsFromServerWithCursor:pageSize:success:failure:" title="asyncGetPublicGroupsFromServerWithCursor:pageSize:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncGetPublicGroupsFromServerWithCursor:pageSize:success:failure:">&ndash;&nbsp;asyncGetPublicGroupsFromServerWithCursor:pageSize:success:failure:</a></code>
+	<a name="//api/name/getPublicGroupsFromServerWithCursor:pageSize:completion:" title="getPublicGroupsFromServerWithCursor:pageSize:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getPublicGroupsFromServerWithCursor:pageSize:completion:">&ndash;&nbsp;getPublicGroupsFromServerWithCursor:pageSize:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -514,12 +523,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncGetPublicGroupsFromServ
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get public groups in the specified range from the server</p>
+				<p>Get public groups with the specified range from the server</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncGetPublicGroupsFromServerWithCursor:(NSString *)<em>aCursor</em> pageSize:(NSInteger)<em>aPageSize</em> success:(void ( ^ ) ( EMCursorResult *aCursor ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getPublicGroupsFromServerWithCursor:(NSString *)<em>aCursor</em> pageSize:(NSInteger)<em>aPageSize</em> completion:(void ( ^ ) ( EMCursorResult *aResult , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -534,17 +543,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aPageSize</code></th>
-						<td><p>Expect result count, will return all results if &lt; 0</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<td><p>Expect result count, return all results if count is less than zero</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -558,7 +562,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get public groups in the specified range from the server</p>
+				<p>Get public groups with the specified range from the server</p>
 			</div>
 			
 
@@ -576,8 +580,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncSearchPublicGroupWithId:success:failure:" title="asyncSearchPublicGroupWithId:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncSearchPublicGroupWithId:success:failure:">&ndash;&nbsp;asyncSearchPublicGroupWithId:success:failure:</a></code>
+	<a name="//api/name/searchPublicGroupWithId:completion:" title="searchPublicGroupWithId:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/searchPublicGroupWithId:completion:">&ndash;&nbsp;searchPublicGroupWithId:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -587,12 +591,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncSearchPublicGroupWithId
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Search public group with the id</p>
+				<p>Search public group with group id</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncSearchPublicGroupWithId:(NSString *)<em>aGroundId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)searchPublicGroupWithId:(NSString *)<em>aGroundId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -606,13 +610,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -626,7 +625,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Search public group with the id</p>
+				<p>Search public group with group id</p>
 			</div>
 			
 
@@ -644,8 +643,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncCreateGroupWithSubject:description:invitees:message:setting:success:failure:" title="asyncCreateGroupWithSubject:description:invitees:message:setting:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncCreateGroupWithSubject:description:invitees:message:setting:success:failure:">&ndash;&nbsp;asyncCreateGroupWithSubject:description:invitees:message:setting:success:failure:</a></code>
+	<a name="//api/name/createGroupWithSubject:description:invitees:message:setting:completion:" title="createGroupWithSubject:description:invitees:message:setting:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/createGroupWithSubject:description:invitees:message:setting:completion:">&ndash;&nbsp;createGroupWithSubject:description:invitees:message:setting:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -660,7 +659,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncCreateGroupWithSubject:
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncCreateGroupWithSubject:(NSString *)<em>aSubject</em> description:(NSString *)<em>aDescription</em> invitees:(NSArray *)<em>aInvitees</em> message:(NSString *)<em>aMessage</em> setting:(EMGroupOptions *)<em>aSetting</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)createGroupWithSubject:(NSString *)<em>aSubject</em> description:(NSString *)<em>aDescription</em> invitees:(NSArray *)<em>aInvitees</em> message:(NSString *)<em>aMessage</em> setting:(EMGroupOptions *)<em>aSetting</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -694,13 +693,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -732,8 +726,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncFetchGroupInfo:includeMembersList:success:failure:" title="asyncFetchGroupInfo:includeMembersList:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncFetchGroupInfo:includeMembersList:success:failure:">&ndash;&nbsp;asyncFetchGroupInfo:includeMembersList:success:failure:</a></code>
+	<a name="//api/name/getGroupSpecificationFromServerByID:includeMembersList:completion:" title="getGroupSpecificationFromServerByID:includeMembersList:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getGroupSpecificationFromServerByID:includeMembersList:completion:">&ndash;&nbsp;getGroupSpecificationFromServerByID:includeMembersList:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -743,12 +737,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncFetchGroupInfo:includeM
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Fetch group info</p>
+				<p>Fetch group specification</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncFetchGroupInfo:(NSString *)<em>aGroupId</em> includeMembersList:(BOOL)<em>aIncludeMembersList</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getGroupSpecificationFromServerByID:(NSString *)<em>aGroupID</em> includeMembersList:(BOOL)<em>aIncludeMembersList</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -756,24 +750,19 @@ <h3 class="method-title"><code><a href="#//api/name/asyncFetchGroupInfo:includeM
 				<h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
-					<tr>
-						<th scope="row" class="argument-name"><code>aGroupId</code></th>
-						<td><p>Group id</p></td>
-					</tr>
-				
 					<tr>
 						<th scope="row" class="argument-name"><code>aIncludeMembersList</code></th>
-						<td><p>Whether get member list</p></td>
+						<td><p>Whether to get member list</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aGroupId</code></th>
+						<td><p>Group id</p></td>
 					</tr>
 				
 				</table>
@@ -787,7 +776,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Fetch group info</p>
+				<p>Fetch group specification</p>
 			</div>
 			
 
@@ -805,8 +794,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncFetchGroupBansList:success:failure:" title="asyncFetchGroupBansList:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncFetchGroupBansList:success:failure:">&ndash;&nbsp;asyncFetchGroupBansList:success:failure:</a></code>
+	<a name="//api/name/getGroupBlackListFromServerByID:completion:" title="getGroupBlackListFromServerByID:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/getGroupBlackListFromServerByID:completion:">&ndash;&nbsp;getGroupBlackListFromServerByID:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -816,12 +805,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncFetchGroupBansList:succ
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Get group‘s blacklist, need owner’s authority</p>
+				<p>Get group&rsquo;s blacklist, owner’s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncFetchGroupBansList:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( NSArray *aList ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)getGroupBlackListFromServerByID:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( NSArray *aList , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -835,13 +824,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -855,7 +839,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Get group‘s blacklist, need owner’s authority</p>
+				<p>Get group&rsquo;s blacklist, owner’s authority is required</p>
 			</div>
 			
 
@@ -873,8 +857,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncAddOccupants:toGroup:welcomeMessage:success:failure:" title="asyncAddOccupants:toGroup:welcomeMessage:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncAddOccupants:toGroup:welcomeMessage:success:failure:">&ndash;&nbsp;asyncAddOccupants:toGroup:welcomeMessage:success:failure:</a></code>
+	<a name="//api/name/addMembers:toGroup:message:completion:" title="addMembers:toGroup:message:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addMembers:toGroup:message:completion:">&ndash;&nbsp;addMembers:toGroup:message:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -889,7 +873,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncAddOccupants:toGroup:we
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncAddOccupants:(NSArray *)<em>aOccupants</em> toGroup:(NSString *)<em>aGroupId</em> welcomeMessage:(NSString *)<em>aWelcomeMessage</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)addMembers:(NSArray *)<em>aUsers</em> toGroup:(NSString *)<em>aGroupId</em> message:(NSString *)<em>aMessage</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -898,7 +882,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aOccupants</code></th>
+						<th scope="row" class="argument-name"><code>aUsers</code></th>
 						<td><p>Invited users</p></td>
 					</tr>
 				
@@ -908,18 +892,13 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aWelcomeMessage</code></th>
+						<th scope="row" class="argument-name"><code>aMessage</code></th>
 						<td><p>Welcome message</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -951,8 +930,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncRemoveOccupants:fromGroup:success:failure:" title="asyncRemoveOccupants:fromGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncRemoveOccupants:fromGroup:success:failure:">&ndash;&nbsp;asyncRemoveOccupants:fromGroup:success:failure:</a></code>
+	<a name="//api/name/removeMembers:fromGroup:completion:" title="removeMembers:fromGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/removeMembers:fromGroup:completion:">&ndash;&nbsp;removeMembers:fromGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -962,12 +941,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncRemoveOccupants:fromGro
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove members from group, need owner‘s authority</p>
+				<p>Remove members from a group, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncRemoveOccupants:(NSArray *)<em>aOccupants</em> fromGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)removeMembers:(NSArray *)<em>aUsers</em> fromGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -976,7 +955,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aOccupants</code></th>
+						<th scope="row" class="argument-name"><code>aUsers</code></th>
 						<td><p>Users to be removed</p></td>
 					</tr>
 				
@@ -986,13 +965,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1006,7 +980,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove members from group, need owner‘s authority</p>
+				<p>Remove members from a group, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1024,8 +998,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncBlockOccupants:fromGroup:success:failure:" title="asyncBlockOccupants:fromGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncBlockOccupants:fromGroup:success:failure:">&ndash;&nbsp;asyncBlockOccupants:fromGroup:success:failure:</a></code>
+	<a name="//api/name/blockMembers:fromGroup:completion:" title="blockMembers:fromGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/blockMembers:fromGroup:completion:">&ndash;&nbsp;blockMembers:fromGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1035,12 +1009,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncBlockOccupants:fromGrou
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Add users to group’s blacklist, need owner‘s authority</p>
+				<p>Add users to group blacklist, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncBlockOccupants:(NSArray *)<em>aOccupants</em> fromGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)blockMembers:(NSArray *)<em>aMembers</em> fromGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1049,7 +1023,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aOccupants</code></th>
+						<th scope="row" class="argument-name"><code>aMembers</code></th>
 						<td><p>Users to be added</p></td>
 					</tr>
 				
@@ -1059,13 +1033,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1079,7 +1048,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Add users to group’s blacklist, need owner‘s authority</p>
+				<p>Add users to group blacklist, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1097,8 +1066,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncUnblockOccupants:forGroup:success:failure:" title="asyncUnblockOccupants:forGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncUnblockOccupants:forGroup:success:failure:">&ndash;&nbsp;asyncUnblockOccupants:forGroup:success:failure:</a></code>
+	<a name="//api/name/unblockMembers:fromGroup:completion:" title="unblockMembers:fromGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/unblockMembers:fromGroup:completion:">&ndash;&nbsp;unblockMembers:fromGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1108,12 +1077,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncUnblockOccupants:forGro
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Remove users from group‘s blacklist, need owner‘s authority</p>
+				<p>Remove users out of group blacklist, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncUnblockOccupants:(NSArray *)<em>aOccupants</em> forGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)unblockMembers:(NSArray *)<em>aMembers</em> fromGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1122,7 +1091,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aOccupants</code></th>
+						<th scope="row" class="argument-name"><code>aMembers</code></th>
 						<td><p>Users to be removed</p></td>
 					</tr>
 				
@@ -1132,13 +1101,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1152,7 +1116,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Remove users from group‘s blacklist, need owner‘s authority</p>
+				<p>Remove users out of group blacklist, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1170,8 +1134,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncChangeGroupSubject:forGroup:success:failure:" title="asyncChangeGroupSubject:forGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncChangeGroupSubject:forGroup:success:failure:">&ndash;&nbsp;asyncChangeGroupSubject:forGroup:success:failure:</a></code>
+	<a name="//api/name/updateGroupSubject:forGroup:completion:" title="updateGroupSubject:forGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updateGroupSubject:forGroup:completion:">&ndash;&nbsp;updateGroupSubject:forGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1181,12 +1145,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncChangeGroupSubject:forG
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Change group’s subject, need owner‘s authority</p>
+				<p>Change the group subject, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncChangeGroupSubject:(NSString *)<em>aSubject</em> forGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updateGroupSubject:(NSString *)<em>aSubject</em> forGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1205,13 +1169,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1225,7 +1184,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Change group’s subject, need owner‘s authority</p>
+				<p>Change the group subject, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1243,8 +1202,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncChangeDescription:forGroup:success:failure:" title="asyncChangeDescription:forGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncChangeDescription:forGroup:success:failure:">&ndash;&nbsp;asyncChangeDescription:forGroup:success:failure:</a></code>
+	<a name="//api/name/updateDescription:forGroup:completion:" title="updateDescription:forGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updateDescription:forGroup:completion:">&ndash;&nbsp;updateDescription:forGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1254,12 +1213,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncChangeDescription:forGr
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Change group’s description, need owner‘s authority</p>
+				<p>Change the group description, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncChangeDescription:(NSString *)<em>aDescription</em> forGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updateDescription:(NSString *)<em>aDescription</em> forGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1278,13 +1237,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1298,7 +1252,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Change group’s description, need owner‘s authority</p>
+				<p>Change the group description, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1316,8 +1270,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncLeaveGroup:success:failure:" title="asyncLeaveGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncLeaveGroup:success:failure:">&ndash;&nbsp;asyncLeaveGroup:success:failure:</a></code>
+	<a name="//api/name/leaveGroup:completion:" title="leaveGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/leaveGroup:completion:">&ndash;&nbsp;leaveGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1332,7 +1286,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncLeaveGroup:success:fail
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncLeaveGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)leaveGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1346,13 +1300,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1384,8 +1333,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDestroyGroup:success:failure:" title="asyncDestroyGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDestroyGroup:success:failure:">&ndash;&nbsp;asyncDestroyGroup:success:failure:</a></code>
+	<a name="//api/name/destroyGroup:completion:" title="destroyGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/destroyGroup:completion:">&ndash;&nbsp;destroyGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1395,12 +1344,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDestroyGroup:success:fa
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Destroy a group, need owner‘s authority</p>
+				<p>Destroy a group, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDestroyGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)destroyGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1414,13 +1363,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1434,7 +1378,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Destroy a group, need owner‘s authority</p>
+				<p>Destroy a group, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1452,8 +1396,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncBlockGroup:success:failure:" title="asyncBlockGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncBlockGroup:success:failure:">&ndash;&nbsp;asyncBlockGroup:success:failure:</a></code>
+	<a name="//api/name/blockGroup:completion:" title="blockGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/blockGroup:completion:">&ndash;&nbsp;blockGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1463,12 +1407,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncBlockGroup:success:fail
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Block group’s message, server will blocks the messages of the group to user, owner can&rsquo;t block the group&rsquo;s message</p>
+				<p>Block group messages, server blocks the messages from the group, owner can&rsquo;t block the group&rsquo;s messages</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncBlockGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)blockGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1482,13 +1426,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1502,7 +1441,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Block group’s message, server will blocks the messages of the group to user, owner can&rsquo;t block the group&rsquo;s message</p>
+				<p>Block group messages, server blocks the messages from the group, owner can&rsquo;t block the group&rsquo;s messages</p>
 			</div>
 			
 
@@ -1520,8 +1459,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncUnblockGroup:success:failure:" title="asyncUnblockGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncUnblockGroup:success:failure:">&ndash;&nbsp;asyncUnblockGroup:success:failure:</a></code>
+	<a name="//api/name/unblockGroup:completion:" title="unblockGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/unblockGroup:completion:">&ndash;&nbsp;unblockGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1536,7 +1475,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncUnblockGroup:success:fa
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncUnblockGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)unblockGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1550,13 +1489,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1588,8 +1522,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncJoinPublicGroup:success:failure:" title="asyncJoinPublicGroup:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncJoinPublicGroup:success:failure:">&ndash;&nbsp;asyncJoinPublicGroup:success:failure:</a></code>
+	<a name="//api/name/joinPublicGroup:completion:" title="joinPublicGroup:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/joinPublicGroup:completion:">&ndash;&nbsp;joinPublicGroup:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1604,7 +1538,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncJoinPublicGroup:success
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncJoinPublicGroup:(NSString *)<em>aGroupId</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)joinPublicGroup:(NSString *)<em>aGroupId</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1618,13 +1552,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1656,8 +1585,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncApplyJoinPublicGroup:message:success:failure:" title="asyncApplyJoinPublicGroup:message:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncApplyJoinPublicGroup:message:success:failure:">&ndash;&nbsp;asyncApplyJoinPublicGroup:message:success:failure:</a></code>
+	<a name="//api/name/requestToJoinPublicGroup:message:completion:" title="requestToJoinPublicGroup:message:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/requestToJoinPublicGroup:message:completion:">&ndash;&nbsp;requestToJoinPublicGroup:message:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1667,12 +1596,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncApplyJoinPublicGroup:me
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Apply to join a public group, group style should be EMGroupStylePublicJoinNeedApproval</p>
+				<p>Request to join a public group, group style should be EMGroupStylePublicJoinNeedApproval</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncApplyJoinPublicGroup:(NSString *)<em>aGroupId</em> message:(NSString *)<em>aMessage</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)requestToJoinPublicGroup:(NSString *)<em>aGroupId</em> message:(NSString *)<em>aMessage</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1691,13 +1620,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1711,7 +1635,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Apply to join a public group, group style should be EMGroupStylePublicJoinNeedApproval</p>
+				<p>Request to join a public group, group style should be EMGroupStylePublicJoinNeedApproval</p>
 			</div>
 			
 
@@ -1729,8 +1653,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncAcceptJoinApplication:applicant:success:failure:" title="asyncAcceptJoinApplication:applicant:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncAcceptJoinApplication:applicant:success:failure:">&ndash;&nbsp;asyncAcceptJoinApplication:applicant:success:failure:</a></code>
+	<a name="//api/name/approveJoinGroupRequest:sender:completion:" title="approveJoinGroupRequest:sender:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/approveJoinGroupRequest:sender:completion:">&ndash;&nbsp;approveJoinGroupRequest:sender:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1740,12 +1664,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncAcceptJoinApplication:a
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Accept user&rsquo;s application, need owner‘s authority</p>
+				<p>Approve a group request, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncAcceptJoinApplication:(NSString *)<em>aGroupId</em> applicant:(NSString *)<em>aUsername</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)approveJoinGroupRequest:(NSString *)<em>aGroupId</em> sender:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1760,17 +1684,12 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The applicant</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<td><p>Group request sender</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1784,7 +1703,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Accept user&rsquo;s application, need owner‘s authority</p>
+				<p>Approve a group request, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1802,8 +1721,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDeclineJoinApplication:applicant:reason:success:failure:" title="asyncDeclineJoinApplication:applicant:reason:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDeclineJoinApplication:applicant:reason:success:failure:">&ndash;&nbsp;asyncDeclineJoinApplication:applicant:reason:success:failure:</a></code>
+	<a name="//api/name/declineJoinGroupRequest:sender:reason:completion:" title="declineJoinGroupRequest:sender:reason:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/declineJoinGroupRequest:sender:reason:completion:">&ndash;&nbsp;declineJoinGroupRequest:sender:reason:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1813,12 +1732,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDeclineJoinApplication:
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Decline user&rsquo;s application, need owner‘s authority</p>
+				<p>Decline a group request, owner‘s authority is required</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDeclineJoinApplication:(NSString *)<em>aGroupId</em> applicant:(NSString *)<em>aUsername</em> reason:(NSString *)<em>aReason</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)declineJoinGroupRequest:(NSString *)<em>aGroupId</em> sender:(NSString *)<em>aUsername</em> reason:(NSString *)<em>aReason</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1833,7 +1752,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				
 					<tr>
 						<th scope="row" class="argument-name"><code>aUsername</code></th>
-						<td><p>The applicant</p></td>
+						<td><p>Group request sender</p></td>
 					</tr>
 				
 					<tr>
@@ -1842,13 +1761,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -1862,7 +1776,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Decline user&rsquo;s application, need owner‘s authority</p>
+				<p>Decline a group request, owner‘s authority is required</p>
 			</div>
 			
 
@@ -1880,8 +1794,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncAcceptInvitationFromGroup:inviter:success:failure:" title="asyncAcceptInvitationFromGroup:inviter:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncAcceptInvitationFromGroup:inviter:success:failure:">&ndash;&nbsp;asyncAcceptInvitationFromGroup:inviter:success:failure:</a></code>
+	<a name="//api/name/acceptInvitationFromGroup:inviter:completion:" title="acceptInvitationFromGroup:inviter:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/acceptInvitationFromGroup:inviter:completion:">&ndash;&nbsp;acceptInvitationFromGroup:inviter:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1891,12 +1805,12 @@ <h3 class="method-title"><code><a href="#//api/name/asyncAcceptInvitationFromGro
 			
 			
 			<div class="method-subsection brief-description">
-				<p>Accept group&rsquo;s invitation</p>
+				<p>Accept a group invitation</p>
 			</div>
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncAcceptInvitationFromGroup:(NSString *)<em>aGroupId</em> inviter:(NSString *)<em>aUsername</em> success:(void ( ^ ) ( EMGroup *aGroup ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)acceptInvitationFromGroup:(NSString *)<em>aGroupId</em> inviter:(NSString *)<em>aUsername</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1910,13 +1824,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 					<tr>
@@ -1935,7 +1844,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 			
 			<div class="method-subsection discussion-section">
 				<h4 class="method-subtitle">Discussion</h4>
-				<p>Accept group&rsquo;s invitation</p>
+				<p>Accept a group invitation</p>
 			</div>
 			
 
@@ -1953,8 +1862,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncDeclineInvitationFromGroup:inviter:reason:success:failure:" title="asyncDeclineInvitationFromGroup:inviter:reason:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncDeclineInvitationFromGroup:inviter:reason:success:failure:">&ndash;&nbsp;asyncDeclineInvitationFromGroup:inviter:reason:success:failure:</a></code>
+	<a name="//api/name/declineGroupInvitation:inviter:reason:completion:" title="declineGroupInvitation:inviter:reason:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/declineGroupInvitation:inviter:reason:completion:">&ndash;&nbsp;declineGroupInvitation:inviter:reason:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -1969,7 +1878,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncDeclineInvitationFromGr
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncDeclineInvitationFromGroup:(NSString *)<em>aGroupId</em> inviter:(NSString *)<em>aUsername</em> reason:(NSString *)<em>aReason</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)declineGroupInvitation:(NSString *)<em>aGroupId</em> inviter:(NSString *)<em>aInviter</em> reason:(NSString *)<em>aReason</em> completion:(void ( ^ ) ( EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -1983,7 +1892,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aUsername</code></th>
+						<th scope="row" class="argument-name"><code>aInviter</code></th>
 						<td><p>Inviter</p></td>
 					</tr>
 				
@@ -1993,13 +1902,8 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 				</table>
@@ -2031,8 +1935,8 @@ <h4 class="method-subtitle">Declared In</h4>
 		</div>
 	</div>
 </div><div class="section-method">
-	<a name="//api/name/asyncIgnoreGroupPush:ignore:success:failure:" title="asyncIgnoreGroupPush:ignore:success:failure:"></a>
-	<h3 class="method-title"><code><a href="#//api/name/asyncIgnoreGroupPush:ignore:success:failure:">&ndash;&nbsp;asyncIgnoreGroupPush:ignore:success:failure:</a></code>
+	<a name="//api/name/updatePushServiceForGroup:isPushEnabled:completion:" title="updatePushServiceForGroup:isPushEnabled:completion:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/updatePushServiceForGroup:isPushEnabled:completion:">&ndash;&nbsp;updatePushServiceForGroup:isPushEnabled:completion:</a></code>
 <span class="task-item-suffix">required method</span></h3>
 
 	<div class="method-info">
@@ -2047,7 +1951,7 @@ <h3 class="method-title"><code><a href="#//api/name/asyncIgnoreGroupPush:ignore:
 			
 		    
 
-			<div class="method-subsection method-declaration"><code>- (void)asyncIgnoreGroupPush:(NSString *)<em>aGroupId</em> ignore:(BOOL)<em>aIsIgnore</em> success:(void ( ^ ) ( ))<em>aSuccessBlock</em> failure:(void ( ^ ) ( EMError *aError ))<em>aFailureBlock</em></code></div>
+			<div class="method-subsection method-declaration"><code>- (void)updatePushServiceForGroup:(NSString *)<em>aGroupID</em> isPushEnabled:(BOOL)<em>aIsEnable</em> completion:(void ( ^ ) ( EMGroup *aGroup , EMError *aError ))<em>aCompletionBlock</em></code></div>
 
 		    
 			
@@ -2056,23 +1960,18 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
 				<table class="argument-def parameter-def">
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aGroupId</code></th>
-						<td><p>Group id</p></td>
+						<th scope="row" class="argument-name"><code>aIsEnable</code></th>
+						<td><p>Whether enable</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aSuccessBlock</code></th>
-						<td><p>The callback block of success</p></td>
+						<th scope="row" class="argument-name"><code>aCompletionBlock</code></th>
+						<td><p>The callback block of completion</p></td>
 					</tr>
 				
 					<tr>
-						<th scope="row" class="argument-name"><code>aFailureBlock</code></th>
-						<td><p>The callback block of failure</p></td>
-					</tr>
-				
-					<tr>
-						<th scope="row" class="argument-name"><code>aIgnore</code></th>
-						<td><p>Whether block</p></td>
+						<th scope="row" class="argument-name"><code>aGroupId</code></th>
+						<td><p>Group id</p></td>
 					</tr>
 				
 				</table>
@@ -2118,7 +2017,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 						
-						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+						<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 						
 						
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/hierarchy.html b/HyphenateSDK/doc/hierarchy.html
index 3ccc666..550ef79 100644
--- a/HyphenateSDK/doc/hierarchy.html
+++ b/HyphenateSDK/doc/hierarchy.html
@@ -103,8 +103,6 @@ <h2 class="index-title">Class Hierarchy</h2>
 
 	<li><a href="Classes/EMCallLocalView.html">EMCallLocalView</a></li>
 
-	<li><a href="Classes/OpenGLView20.html">OpenGLView20</a></li>
-
 </ul>
 </li>
 
@@ -151,7 +149,7 @@ <h2 class="index-title">Protocol References</h2>
 					<footer>
 						<div class="footer-copyright">
 							
-							<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+							<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 							
 							
 							<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
diff --git a/HyphenateSDK/doc/index.html b/HyphenateSDK/doc/index.html
index b3d6e41..2bf551f 100644
--- a/HyphenateSDK/doc/index.html
+++ b/HyphenateSDK/doc/index.html
@@ -90,8 +90,6 @@ <h2 class="index-title">Class References</h2>
 								
 								<li><a href="Classes/EMVoiceMessageBody.html">EMVoiceMessageBody</a></li>
 								
-								<li><a href="Classes/OpenGLView20.html">OpenGLView20</a></li>
-								
 							</ul>
 						</div>
 						
@@ -137,7 +135,7 @@ <h2 class="index-title">Protocol References</h2>
 					<footer>
 						<div class="footer-copyright">
 							
-							<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-06-07</p>
+							<p class="copyright">Copyright &copy; 2016 Hyphenate Inc. All rights reserved. Updated: 2016-08-22</p>
 							
 							
 							<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>