diff --git a/modules/default/alert/README.md b/modules/default/alert/README.md
index bf67e15e..91878319 100644
--- a/modules/default/alert/README.md
+++ b/modules/default/alert/README.md
@@ -45,9 +45,9 @@ The following properties can be configured:
 		</tr>
 		<tr>
 			<td><code>display_time</code></td>
-			<td>Time a notification is displayed.<br>
-				<br><b>Possible values:</b> <code>int</code>
-				<br><b>Default value:</b> <code>3500</code>
+			<td>Time a notification is displayed in seconds.<br>
+				<br><b>Possible values:</b> <code>float</code> <code>int</code>
+				<br><b>Default value:</b> <code>3.5</code>
 			</td>
 		</tr>
 		<tr>
@@ -140,8 +140,8 @@ self.sendNotification("SHOW_ALERT", {title: "Hello", message: "This is a test!",
 		</tr>
 		<tr>
 			<td><code>timer</code> (optional)</td>
-			<td>How long the alert should stay visible.<br>
-				<br><b>Possible values:</b> <code>int</code>
+			<td>How long the alert should stay visible in seconds.<br>
+				<br><b>Possible values:</b> <code>int</code> <code>float</code>
 				<br><b>Default value:</b> <code>none</code>
 				<br><b>Important:</b> If you do not use the `timer`, it is your duty to hide the alert by using <code>self.sendNotification("HIDE_ALERT");</code>!
 			</td>
diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js
index 2f53c29f..73ffcd27 100644
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -13,8 +13,8 @@ Module.register('alert',{
 		effect: "slide",
 		// scale|slide|genie|jelly|flip|bouncyflip|exploader
 		alert_effect:"jelly",
-		//time a notification is displayed
-		display_time: 3500,
+		//time a notification is displayed in seconds
+		display_time: 3.5,
 		//Position
 		position: "center",
 		//shown at startup
@@ -32,13 +32,18 @@ Module.register('alert',{
 			message : message,
 			layout : "growl",
 			effect : this.config.effect,
-			ttl: this.config.display_time
+			ttl: this.config.display_time * 1000
 		}).show();
 	},
 	show_alert: function (params, sender) {
 		var self = this
 		//Set standard params if not provided by module
-		if (typeof params.timer === 'undefined') { params.timer = null; }
+		if (typeof params.timer === 'undefined') { 
+			params.timer = null; 
+		}
+		else {
+			params.timer = params.timer * 1000
+		}
 		if (typeof params.imageHeight === 'undefined') { params.imageHeight = "80px"; }
 		if (typeof params.imageUrl === 'undefined') { 
 			params.imageUrl = null;
@@ -63,7 +68,7 @@ Module.register('alert',{
 		this.alerts[sender.name] = new NotificationFx({
 			message : image + message,
 			effect : this.config.alert_effect,
-			ttl: null,
+			ttl: params.timer,
 			al_no: "ns-alert"
 		});
 		//Show alert