diff --git a/.travis.yml b/.travis.yml
index 83738643..da3578f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,9 @@ script: xcodebuild clean && xcodebuild build -configuration release -project Mac
 #  - zip -9r ./build/Build/Products/Release/MacPass.app MacPass-continuous.zip
 #  - wget -c https://github.com/MacPass/uploadtool/raw/master/upload.sh
 #  - bash ./upload.sh build/*
-  
+
+# TODO: fix versioning since it yield a 00 release number
+
 branches:
   only:
     - /^(?i:continuous)$/
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index c664c11b..bdae2804 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1682,8 +1682,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "git=`sh /etc/profile; which git`\nbranch_name=`$git symbolic-ref HEAD | sed -e 's,.*/\\\\(.*\\\\),\\\\1,'`\ngit_count=`$git rev-list $branch_name |wc -l | sed 's/^ *//;s/ *$//'`\nsimple_branch_name=`$git rev-parse --abbrev-ref HEAD`\n\nbuild_number=\"${git_count}0\"\nif [ $CONFIGURATION != \"Release\" ]; then\nbuild_number+=\"-$simple_branch_name\"\nfi\n\nplist=\"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\ndsym_plist=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist\"\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $build_number\" \"$plist\"\nif [ -f \"$DSYM_INFO_PLIST\" ] ; then\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $build_number\" \"$dsym_plist\"\nfi";
-			showEnvVarsInLog = 0;
+			shellScript = "git=`sh /etc/profile; which git`\nbranch_name=`$git symbolic-ref HEAD | sed -e 's,.*/\\\\(.*\\\\),\\\\1,'`\ngit_count=`$git rev-list $branch_name |wc -l | sed 's/^ *//;s/ *$//'`\nsimple_branch_name=`$git rev-parse --abbrev-ref HEAD`\n\nbuild_number=\"${git_count}0\"\nif [ $CONFIGURATION != \"Release\" ]; then\nbuild_number+=\"-$simple_branch_name\"\nfi\nif [ $simple_branch_name = \"travis_continuous\" ]; then\nbuild_date=`date +\"%Y%m%d%H%m%S\"`\nbuild_number=\"$build_date-continuous\"\nfi\n\n\nplist=\"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\ndsym_plist=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist\"\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $build_number\" \"$plist\"\nif [ -f \"$DSYM_INFO_PLIST\" ] ; then\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $build_number\" \"$dsym_plist\"\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index 61b35c9b..9cc9d374 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -157,13 +157,16 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
+#if defined(NOSPARKLE)
+  NSLog(@"Sparkle explicitly disabled!!!");
+#endif
   /* Daemon instanziieren */
   [MPLockDaemon defaultDaemon];
   [MPAutotypeDaemon defaultDaemon];
   /* Create Plugin Manager */
   [MPPluginHost sharedHost];
-#ifndef DEBUG
-  /* Only enable updater in Release */
+#if !defined(DEBUG) && !defined(NOSPARKLE)
+  /* Disable updates if in debug or nosparkle  */
   [SUUpdater sharedUpdater];
 #endif
 }
@@ -231,10 +234,10 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
 }
 
 - (void)checkForUpdates:(id)sender {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NOSPARKLE)
   NSAlert *alert = [[NSAlert alloc] init];
   alert.messageText = @"Updates are disabled!";
-  alert.informativeText = [NSString stringWithFormat:@"Sparkle updates are only available in offical releases of %@!", NSApp.applicationName];
+  alert.informativeText = [NSString stringWithFormat:@"Sparkle updates are disabled for this build of %@!", NSApp.applicationName];
   [alert addButtonWithTitle:@"Ok"];
   [alert runModal];
 #else
diff --git a/MacPass/MPUpdateSettingsController.m b/MacPass/MPUpdateSettingsController.m
index 754ff71a..01439796 100644
--- a/MacPass/MPUpdateSettingsController.m
+++ b/MacPass/MPUpdateSettingsController.m
@@ -35,7 +35,7 @@
 
 - (void)awakeFromNib {
 /* only enable bindings to settings in release mode */
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NOSPARKLE)
   self.checkIntervallPopupButton.enabled = NO;
   self.automaticallyCheckForUpdatesCheckButton.enabled = NO;
 #else