diff --git a/__MACOSX/Razorpay.framework/._.DS_Store b/__MACOSX/Razorpay.framework/._.DS_Store
deleted file mode 100644
index 09fa6bdda..000000000
Binary files a/__MACOSX/Razorpay.framework/._.DS_Store and /dev/null differ
diff --git a/example/ios/Razorpay.framework/Debug.xcconfig b/example/ios/Razorpay.framework/Debug.xcconfig
new file mode 100644
index 000000000..b7eba559a
--- /dev/null
+++ b/example/ios/Razorpay.framework/Debug.xcconfig
@@ -0,0 +1,12 @@
+//
+//  Debug.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = YES
+OTHER_SWIFT_FLAGS = 
diff --git a/example/ios/Razorpay.framework/Info.plist b/example/ios/Razorpay.framework/Info.plist
index 2df38b5da..5ca0c6dca 100644
Binary files a/example/ios/Razorpay.framework/Info.plist and b/example/ios/Razorpay.framework/Info.plist differ
diff --git a/example/ios/Razorpay.framework/LegacySwiftRelease.xcconfig b/example/ios/Razorpay.framework/LegacySwiftRelease.xcconfig
new file mode 100644
index 000000000..30f40b235
--- /dev/null
+++ b/example/ios/Razorpay.framework/LegacySwiftRelease.xcconfig
@@ -0,0 +1,14 @@
+//
+//  LegacySwift.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = NO
+// the following variable is initialize with nothing (empty)
+OTHER_SWIFT_FLAGS = 
+
diff --git a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule
index 8119b0085..331bd34b4 100644
Binary files a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule and b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule differ
diff --git a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule
index 1cf6b09bb..9f6fcda3a 100644
Binary files a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule and b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule differ
diff --git a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule
index 22ccebdaa..f9c34d1e7 100644
Binary files a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule and b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule differ
diff --git a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule
index 0f787401c..acd698495 100644
Binary files a/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule and b/example/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule differ
diff --git a/example/ios/Razorpay.framework/Modules/module.modulemap b/example/ios/Razorpay.framework/Modules/module.modulemap
index 16e8c7758..28e7e1d57 100644
--- a/example/ios/Razorpay.framework/Modules/module.modulemap
+++ b/example/ios/Razorpay.framework/Modules/module.modulemap
@@ -11,7 +11,7 @@ module Razorpay.Swift {
 }
 
 module RazorpayCommonCrypto [system] {
-	header "/Applications/Xcode9.3.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/CommonCrypto/CommonCrypto.h"
+	header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/CommonCrypto/CommonCrypto.h"
 	export *
 }
 
diff --git a/example/ios/Razorpay.framework/Razorpay b/example/ios/Razorpay.framework/Razorpay
index 8cabd8382..8c6f5ecc9 100755
Binary files a/example/ios/Razorpay.framework/Razorpay and b/example/ios/Razorpay.framework/Razorpay differ
diff --git a/example/ios/Razorpay.framework/Release.xcconfig b/example/ios/Razorpay.framework/Release.xcconfig
new file mode 100644
index 000000000..ce2a3e709
--- /dev/null
+++ b/example/ios/Razorpay.framework/Release.xcconfig
@@ -0,0 +1,12 @@
+//
+//  Release.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = NO
+OTHER_SWIFT_FLAGS =
diff --git a/example/ios/Razorpay.framework/UITest.xcconfig b/example/ios/Razorpay.framework/UITest.xcconfig
new file mode 100644
index 000000000..95d35303a
--- /dev/null
+++ b/example/ios/Razorpay.framework/UITest.xcconfig
@@ -0,0 +1,12 @@
+//
+//  Test.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = YES
+OTHER_SWIFT_FLAGS = -D 'TestEnvironment'
diff --git a/example/package.json b/example/package.json
index b7f478162..97b2b8319 100644
--- a/example/package.json
+++ b/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example",
-  "version": "0.0.2",
+  "version": "1.0.1",
   "private": true,
   "scripts": {
     "start": "node_modules/react-native/packager/packager.sh"
diff --git a/ios/Razorpay.framework/Debug.xcconfig b/ios/Razorpay.framework/Debug.xcconfig
new file mode 100644
index 000000000..b7eba559a
--- /dev/null
+++ b/ios/Razorpay.framework/Debug.xcconfig
@@ -0,0 +1,12 @@
+//
+//  Debug.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = YES
+OTHER_SWIFT_FLAGS = 
diff --git a/ios/Razorpay.framework/Info.plist b/ios/Razorpay.framework/Info.plist
index 2df38b5da..5ca0c6dca 100644
Binary files a/ios/Razorpay.framework/Info.plist and b/ios/Razorpay.framework/Info.plist differ
diff --git a/ios/Razorpay.framework/LegacySwiftRelease.xcconfig b/ios/Razorpay.framework/LegacySwiftRelease.xcconfig
new file mode 100644
index 000000000..30f40b235
--- /dev/null
+++ b/ios/Razorpay.framework/LegacySwiftRelease.xcconfig
@@ -0,0 +1,14 @@
+//
+//  LegacySwift.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = NO
+// the following variable is initialize with nothing (empty)
+OTHER_SWIFT_FLAGS = 
+
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule
index 8119b0085..331bd34b4 100644
Binary files a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule and b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm.swiftmodule differ
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule
index 1cf6b09bb..9f6fcda3a 100644
Binary files a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule and b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/arm64.swiftmodule differ
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule
index 22ccebdaa..f9c34d1e7 100644
Binary files a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule and b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/i386.swiftmodule differ
diff --git a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule
index 0f787401c..acd698495 100644
Binary files a/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule and b/ios/Razorpay.framework/Modules/Razorpay.swiftmodule/x86_64.swiftmodule differ
diff --git a/ios/Razorpay.framework/Razorpay b/ios/Razorpay.framework/Razorpay
index 8cabd8382..8c6f5ecc9 100755
Binary files a/ios/Razorpay.framework/Razorpay and b/ios/Razorpay.framework/Razorpay differ
diff --git a/ios/Razorpay.framework/Release.xcconfig b/ios/Razorpay.framework/Release.xcconfig
new file mode 100644
index 000000000..ce2a3e709
--- /dev/null
+++ b/ios/Razorpay.framework/Release.xcconfig
@@ -0,0 +1,12 @@
+//
+//  Release.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = NO
+OTHER_SWIFT_FLAGS =
diff --git a/ios/Razorpay.framework/UITest.xcconfig b/ios/Razorpay.framework/UITest.xcconfig
new file mode 100644
index 000000000..95d35303a
--- /dev/null
+++ b/ios/Razorpay.framework/UITest.xcconfig
@@ -0,0 +1,12 @@
+//
+//  Test.xcconfig
+//  RazorpayIOS
+//
+//  Created by N.A Shashank on 24/04/18.
+//  Copyright © 2018 Razorpay. All rights reserved.
+//
+
+// OTHER_SWIFT_FLAGS is not inherited due to some reason so if you have a value for other swift flags you have to manually set the configuration file for that target
+IS_BITCODE_ENABLED = YES
+BUILD_ACTIVE_ARCHITECTURE = YES
+OTHER_SWIFT_FLAGS = -D 'TestEnvironment'
diff --git a/ios/SelectDefaultXcode.sh b/ios/SelectDefaultXcode.sh
new file mode 100644
index 000000000..145e8d97d
--- /dev/null
+++ b/ios/SelectDefaultXcode.sh
@@ -0,0 +1,25 @@
+# to make sure that any command that fails in turn return a non zero status and does not continue further
+
+set -e
+
+# get framework path from command line or use the current working directory as the path
+
+if [ $# -eq 0 ] ; then		
+FRAMEWORK_PATH=$(pwd)/Razorpay.framework/
+echo "Using the current working directory as the framework path which is $FRAMEWORK_PATH"
+else
+FRAMEWORK_PATH=$1
+fi
+
+#navigate to the module map
+
+cd "$FRAMEWORK_PATH/Modules/"
+
+#find xcode path and replace it with the default
+
+DEFAULT_XCODE_PATH="$(xcode-select -p)"
+IFS='/'
+read -ra ARRAY <<< "$DEFAULT_XCODE_PATH"
+XCODE_COMPONENT=${ARRAY[2]}
+STRING_TO_BE_REPLACED="Xcode.app"
+sed -i '' "s/$STRING_TO_BE_REPLACED/$XCODE_COMPONENT/g" module.modulemap
diff --git a/package.json b/package.json
index 75934ef68..d77d4b1f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-razorpay",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "React Native wrapper for Razorpay",
   "main": "RazorpayCheckout.js",
   "scripts": {