diff --git a/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist b/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist
index d3671bd..d3de8ee 100644
--- a/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist
+++ b/LinqToObjectiveC/LinqToObjectiveC-iOS-dynamic/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.dodikk.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist b/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist
index d3671bd..d3de8ee 100644
--- a/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist
+++ b/LinqToObjectiveC/LinqToObjectiveC-iOS-static/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.dodikk.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj
index 813f1f9..67fcffb 100644
--- a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj
+++ b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/project.pbxproj
@@ -246,7 +246,7 @@
 		7E8F43791A8B92D5000F5D01 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = scottlogic;
 				TargetAttributes = {
 					7E8F43801A8B92D5000F5D01 = {
@@ -346,6 +346,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -435,6 +436,7 @@
 				INFOPLIST_FILE = "LinqToObjectiveC-iOS-dynamic/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = LinqToObjectiveC;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -455,6 +457,7 @@
 				INFOPLIST_FILE = "LinqToObjectiveC-iOS-dynamic/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = LinqToObjectiveC;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -480,6 +483,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = LinqToObjectiveC;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -501,6 +505,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.dodikk.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = LinqToObjectiveC;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -537,6 +542,7 @@
 				7EEE35BC1AB4711000668C3E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		7EEE35DE1AB4718500668C3E /* Build configuration list for PBXNativeTarget "LinqToObjectiveC-iOS-static" */ = {
 			isa = XCConfigurationList;
@@ -545,6 +551,7 @@
 				7EEE35E01AB4718500668C3E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme
index 1dde0a5..3fdbdba 100644
--- a/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme
+++ b/LinqToObjectiveC/LinqToObjectiveC.xcodeproj/xcshareddata/xcschemes/LinqToObjectiveC-iOS-dynamic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,15 +38,18 @@
             ReferencedContainer = "container:LinqToObjectiveC.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -61,10 +64,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/NSArray+LinqExtensions.m b/NSArray+LinqExtensions.m
index 9716aa4..7307fdd 100644
--- a/NSArray+LinqExtensions.m
+++ b/NSArray+LinqExtensions.m
@@ -138,12 +138,9 @@ - (NSArray *)linq_distinct:(LINQSelector)keySelector
 - (id)linq_aggregate:(LINQAccumulator)accumulator
 {
     id aggregate = nil;
-    for (id item in self) {
-        if (aggregate == nil) {
-            aggregate = item;
-        } else {
-            aggregate = accumulator(item, aggregate);
-        }
+    for (id item in self)
+    {
+        aggregate = accumulator(item, aggregate);
     }
     return aggregate;
 }