diff --git a/Info.plist b/Info.plist
index 37780ea9..86be792c 100644
--- a/Info.plist
+++ b/Info.plist
@@ -109,7 +109,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4</string>
+	<string>0.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -129,7 +129,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>351 Beta 1</string>
+	<string>Build and Version set by script!</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.lifestyle</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Podfile.lock b/Podfile.lock
index ddcbe790..733dd08b 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: fa150038f6c8e2bd91237273cf2233fefb2dc11c
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0.beta.2
diff --git a/WiredClient.xcodeproj/project.pbxproj b/WiredClient.xcodeproj/project.pbxproj
index edac0cdc..caf49852 100644
--- a/WiredClient.xcodeproj/project.pbxproj
+++ b/WiredClient.xcodeproj/project.pbxproj
@@ -1698,6 +1698,7 @@
 				770B8A64075C86BD005327F5 /* Copy Frameworks */,
 				4C2BDA5417F909230069B38E /* Copy Emoticon Packs */,
 				41A4977D16E8C8CEE4C029C0 /* [CP] Embed Pods Frameworks */,
+				84EEF029219E29A8009040DE /* Set Build Number */,
 			);
 			buildRules = (
 			);
@@ -1900,7 +1901,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Wired Client/Pods-Wired Client-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Wired Client/Pods-Wired Client-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/NSDate+TimeAgo/NSDate_TimeAgo.framework",
 				"${BUILT_PRODUCTS_DIR}/SBJson4/SBJson4.framework",
 				"${PODS_ROOT}/Sparkle/Sparkle.framework",
@@ -1915,7 +1916,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Wired Client/Pods-Wired Client-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Wired Client/Pods-Wired Client-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		4C06678915DEC69F00E8D810 /* ShellScript */ = {
@@ -2020,7 +2021,7 @@
 			shellScript = "sh \"$SRCROOT/../../wired_client_localize.sh\" || exit 1";
 			showEnvVarsInLog = 0;
 		};
-		84C45C172192353600B83198 /* Set Build Number */ = {
+		84EEF029219E29A8009040DE /* Set Build Number */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
diff --git a/WiredClient.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/WiredClient.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
index 7b86906b..dcf6a4c9 100644
--- a/WiredClient.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/WiredClient.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Basic.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>27</integer>
 		</dict>
 		<key>Distribution.xcscheme</key>
 		<dict>
@@ -22,12 +22,12 @@
 		<key>Localize Strings.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>28</integer>
 		</dict>
 		<key>Neo.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>29</integer>
 		</dict>
 		<key>PSMTabBarControl.xcscheme</key>
 		<dict>
@@ -37,7 +37,7 @@
 		<key>Vintage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>30</integer>
 		</dict>
 		<key>Wired Client (Distribute Debug).xcscheme_^#shared#^_</key>
 		<dict>
@@ -47,7 +47,7 @@
 		<key>Wired Client (Distribute).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>26</integer>
 		</dict>
 		<key>Wired Client.xcscheme</key>
 		<dict>
diff --git a/set_build_number.sh b/set_build_number.sh
index d18b7fff..d1dfef82 100755
--- a/set_build_number.sh
+++ b/set_build_number.sh
@@ -7,13 +7,15 @@
 #  
 
 git=$(sh /etc/profile; which git)
-git_hash=$("$git" rev-parse --short HEAD)
+number_of_commits=$("$git" rev-list HEAD --count)
+git_release_version=$("$git" describe --tags --always --abbrev=0)
 
 target_plist="$TARGET_BUILD_DIR/$INFOPLIST_PATH"
 dsym_plist="$DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME/Contents/Info.plist"
 
 for plist in "$target_plist" "$dsym_plist"; do
-if [ -f "$plist" ]; then
-/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $git_hash" "$plist"
-fi
+  if [ -f "$plist" ]; then
+    /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $number_of_commits" "$plist"
+    /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${git_release_version#*v}" "$plist"
+  fi
 done
diff --git a/vendor/WiredFrameworks/WiredFrameworks.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/vendor/WiredFrameworks/WiredFrameworks.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
index 67558e28..36697082 100644
--- a/vendor/WiredFrameworks/WiredFrameworks.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/vendor/WiredFrameworks/WiredFrameworks.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,6 +4,11 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
+		<key>ChatHistory-default.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>32</integer>
+		</dict>
 		<key>StaticWiredData.xcscheme</key>
 		<dict>
 			<key>orderHint</key>