diff --git a/Pomodoro.xcodeproj/project.pbxproj b/Pomodoro.xcodeproj/project.pbxproj
index c953640..a6f5715 100644
--- a/Pomodoro.xcodeproj/project.pbxproj
+++ b/Pomodoro.xcodeproj/project.pbxproj
@@ -893,6 +893,7 @@
 		69AE95DA133B4705004DC14D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0420;
 				ORGANIZATIONNAME = iUgol;
 			};
 			buildConfigurationList = 69AE95DD133B4705004DC14D /* Build configuration list for PBXProject "Pomodoro" */;
diff --git a/Pomodoro/Pomodoro-Info.plist b/Pomodoro/Pomodoro-Info.plist
index 93f89e7..1f7d047 100644
--- a/Pomodoro/Pomodoro-Info.plist
+++ b/Pomodoro/Pomodoro-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBuildNumber</key>
-	<integer>42</integer>
+	<integer>51</integer>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
diff --git a/Pomodoro/src/PomodoroController.m b/Pomodoro/src/PomodoroController.m
index 2c884e0..90cde03 100644
--- a/Pomodoro/src/PomodoroController.m
+++ b/Pomodoro/src/PomodoroController.m
@@ -45,12 +45,27 @@ @implementation PomodoroController
 
 #pragma mark ---- Helper methods ----
 
-- (void) showTimeOnStatusBar:(NSInteger) time {	
-	if ([self checkDefault:@"showTimeOnStatusEnabled"]) {
-		[statusItem setTitle:[NSString stringWithFormat:@" %.2d:%.2d",time/60, time%60]];
-	} else {
-		[statusItem setTitle:@""];
-	}
+- (void) showTimeOnStatusBar:(NSInteger) time {
+    enum PomoState state = pomodoro.state;
+    if(state == PomoTicking){
+        if ([self checkDefault:@"showNameOnStatusEnabled"] && [self checkDefault:@"showTimeOnStatusEnabled"]) {
+            [statusItem setTitle:[NSString stringWithFormat:@" %@ - %.2d:%.2d",_pomodoroName, time/60, time%60]];
+        }
+        else if ([self checkDefault:@"showNameOnStatusEnabled"]) {
+            [statusItem setTitle:[NSString stringWithFormat:@" %@",_pomodoroName]];
+        }
+        else if ([self checkDefault:@"showTimeOnStatusEnabled"]) {
+            [statusItem setTitle:[NSString stringWithFormat:@"%.2d:%.2d", time/60, time%60]];
+        } else {
+            [statusItem setTitle:@""];
+        }
+    } else {
+        if ([self checkDefault:@"showTimeOnStatusEnabled"]) {
+            [statusItem setTitle:[NSString stringWithFormat:@"%.2d:%.2d", time/60, time%60]];
+        } else {
+            [statusItem setTitle:@""];
+        }
+    }
 }
 
 - (void) longBreakCheckerFinished {
@@ -584,6 +599,7 @@ - (void)awakeFromNib {
 	[self observeUserDefault:@"tickVolume"];
 	[self observeUserDefault:@"initialTime"];
 	
+    [self observeUserDefault:@"showNameOnStatusEnabled"];
 	[self observeUserDefault:@"showTimeOnStatusEnabled"];
 	
 	if ([self checkDefault:@"showSplashScreenAtStartup"]) {
diff --git a/Pomodoro/src/PomodoroDefaults.m b/Pomodoro/src/PomodoroDefaults.m
index bfa2258..84610a1 100644
--- a/Pomodoro/src/PomodoroDefaults.m
+++ b/Pomodoro/src/PomodoroDefaults.m
@@ -161,6 +161,7 @@ + (void) setDefaults {
 	[defaultValues setObject:[NSNumber numberWithInt:80] forKey:@"voiceVolume"];
 	[defaultValues setObject:[NSNumber numberWithInt:20] forKey:@"tickVolume"];
 	
+    [defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"showNameOnStatusEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"showTimeOnStatusEnabled"];
 	
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"calendarEnabled"];
@@ -314,6 +315,7 @@ +(void)removeDefaults {
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"ringBreakVolume"];
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"voiceVolume"];
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"tickVolume"];
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showNameOnStatusEnabled"];
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showTimeOnStatusEnabled"];
 	
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"calendarEnabled"];