diff --git a/.gitignore b/.gitignore
index 8a2f69d..b2747e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ CVS
 **/!*.xcworkspace/contents.xcworkspacedata
 !xcshareddata
 xcuserdata
+VKSdkWorkspace.xcworkspace/xcshareddata/
 
 #Project files
 [Bb]uild/
@@ -30,3 +31,7 @@ DerivedData/
 
 #CocoaPods
 Pods
+
+#AppCode
+*/.idea/*
+.idea/*
diff --git a/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj b/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj
index 561bc21..5afa8b2 100644
--- a/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj
+++ b/VKSDKTestApplication/VKSDKTestApplication.xcodeproj/project.pbxproj
@@ -316,10 +316,7 @@
 					"VKDEBUG=1",
 				);
 				INFOPLIST_FILE = "VKSDKTestApplication/VKSDKTestApplication-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VKSdkWorkspace-ghpvcyvmpixypwgqyfufolinkorb/Build/Products/Debug-iphoneos",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -341,10 +338,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "VKSDKTestApplication/VKSDKTestApplication-Prefix.pch";
 				INFOPLIST_FILE = "VKSDKTestApplication/VKSDKTestApplication-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/VKSdkWorkspace-ghpvcyvmpixypwgqyfufolinkorb/Build/Products/Debug-iphoneos",
-				);
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
diff --git a/sdk/sdk/VKAuthorizeController.m b/sdk/sdk/VKAuthorizeController.m
index 3095d9f..0534e2d 100644
--- a/sdk/sdk/VKAuthorizeController.m
+++ b/sdk/sdk/VKAuthorizeController.m
@@ -52,7 +52,7 @@ static NSString *const REDIRECT_URL = @"https://oauth.vk.com/blank.html";
 + (void)presentThisController:(VKAuthorizeController *)controller {
 	UINavigationController *navigation = [[UINavigationController alloc] initWithRootViewController:controller];
 
-	if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) {
+	if (VK_SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) {
 		navigation.navigationBar.barTintColor = VK_COLOR;
 		navigation.navigationBar.tintColor = [UIColor whiteColor];
         navigation.navigationBar.translucent = YES;
@@ -77,7 +77,7 @@ static NSString *const REDIRECT_URL = @"https://oauth.vk.com/blank.html";
 
 - (void)loadView {
 	[super loadView];
-	if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) {
+	if (VK_SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0")) {
 		self.edgesForExtendedLayout = UIRectEdgeNone;
 	}
 	UIView *view = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
diff --git a/sdk/sdk/VKUtil.h b/sdk/sdk/VKUtil.h
index 80c0d88..60557f8 100644
--- a/sdk/sdk/VKUtil.h
+++ b/sdk/sdk/VKUtil.h
@@ -20,11 +20,11 @@
 //  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 //  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#define SYSTEM_VERSION_EQUAL_TO(v)                  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame)
-#define SYSTEM_VERSION_GREATER_THAN(v)              ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending)
-#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
-#define SYSTEM_VERSION_LESS_THAN(v)                 ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
-#define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v)     ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending)
+#define VK_SYSTEM_VERSION_EQUAL_TO(v)                  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame)
+#define VK_SYSTEM_VERSION_GREATER_THAN(v)              ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending)
+#define VK_SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+#define VK_SYSTEM_VERSION_LESS_THAN(v)                 ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
+#define VK_SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v)     ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending)
 #define VK_COLOR                                    [UIColor colorWithRed:85.0f / 255 green:133.0f / 255 blue:188.0f / 255 alpha:1.0f]
 #import <Foundation/Foundation.h>
 /**