diff --git a/.gitignore b/.gitignore
index b83632eaa..f1811806d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .htaccess
 node_modules
 package-lock.json
+.DS_Store
diff --git a/apps/rclock/ChangeLog b/apps/rclock/ChangeLog
index a8f708a0a..23b1a6e87 100644
--- a/apps/rclock/ChangeLog
+++ b/apps/rclock/ChangeLog
@@ -1 +1,2 @@
 0.01: First published version of app
+0.02: Added support for locale and 12H clock
\ No newline at end of file
diff --git a/apps/rclock/rclock.app.js b/apps/rclock/rclock.app.js
index bd8395116..4e63fe36a 100644
--- a/apps/rclock/rclock.app.js
+++ b/apps/rclock/rclock.app.js
@@ -4,6 +4,8 @@
   var hours;
   var date;
   var first = true;
+  var locale = require('locale');
+  var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false;
 
   const screen = {
     width: g.getWidth(),
@@ -41,17 +43,7 @@
   };
 
   const dateStr = function (date) {
-    day = date.getDate();
-    month = date.getMonth();
-    year = date.getFullYear();
-    if (day < 10) {
-      day = "0" + day;
-    }
-    if (month < 10) {
-      month = "0" + month;
-    }
-
-    return year + "-" + month + "-" + day;
+    return locale.date(new Date(), 1);
   };
 
   const getArcXY = function (centerX, centerY, radius, angle) {
@@ -72,7 +64,7 @@
     //g.setPixel(r[0],r[1]);
     g.drawLine(r1[0], r1[1], r2[0], r2[1]);
     g.setColor('#333333');
-    g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width-4)
+    g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4)
   };
 
   const drawSecArc = function (sections, color) {
@@ -84,7 +76,7 @@
     //g.setPixel(r[0],r[1]);
     g.drawLine(r1[0], r1[1], r2[0], r2[1]);
     g.setColor('#333333');
-    g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width-4)
+    g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4)
   };
 
   const drawClock = function () {
@@ -104,7 +96,7 @@
       }
       first = false;
     }
-    
+
     // Reset seconds
     if (seconds == 59) {
       g.setColor('#000000');
@@ -128,14 +120,34 @@
     //Update seconds when needed
     if (seconds != currentTime.getSeconds()) {
       seconds = currentTime.getSeconds();
-      drawSecArc(seconds,  settings.circle.colorsec);
+      drawSecArc(seconds, settings.circle.colorsec);
     }
 
     //Write the time as configured in the settings
     hours = currentTime.getHours();
+    if (_12hour && hours > 13) {
+      hours = hours - 12;
+    }
+
+    var meridian;
+
+    if (typeof locale.meridian === "function") {
+      meridian = locale.meridian(new Date());
+    } else {
+      meridian = "";
+    }
+
+    var timestr;
+
+    if (meridian.length > 0 && _12hour) {
+      timestr = hours + " " + meridian;
+    } else {
+      timestr = hours;
+    }
+
     g.setColor(settings.time.color);
     g.setFont(settings.time.font, settings.time.size);
-    g.drawString(hours, settings.time.center, settings.time.middle);
+    g.drawString(timestr, settings.time.center, settings.time.middle);
 
     //Write the date as configured in the settings
     g.setColor(settings.date.color);
@@ -149,7 +161,7 @@
 
   // clean app screen
   g.clear();
-  g.setFontAlign( 0, 0, 0);
+  g.setFontAlign(0, 0, 0);
   Bangle.loadWidgets();
   Bangle.drawWidgets();