diff --git a/dist/image-editor.js b/dist/image-editor.js
index b003743..cfd5372 100644
--- a/dist/image-editor.js
+++ b/dist/image-editor.js
@@ -1248,6 +1248,8 @@ function ImageEditor(canvasId, args) {
             hideRulers: 'Hide Ruler',
             showFullscreen: 'Fullscreen',
             exitFullscreen: 'Exit Fullscreen',
+            cm: 'cm',
+            inch: 'inch'
         },
         // Default dimensions
         dimensions: {
@@ -1442,8 +1444,13 @@ function RulerHandler(viewport) {
         if (axis === 'top') {
             dim = viewport.getData().dim.height - dim;
         }
-
-        ruler.setText(Math.round(dim * 100) / 100 + ' ' + viewport.getData().dim.units);
+        var units = viewport.getData().dim.units;
+        var value = Math.round(dim * 100) / 100;
+        if(units === 'cm') {
+            value = Math.round(value);
+        }
+        var label = viewport.canvas.__texts[units] || 'cm';
+        ruler.setText(value + ' ' + label);
     }
 
     var Event = {
diff --git a/src/ImageEditor.js b/src/ImageEditor.js
index b263fd5..c975064 100644
--- a/src/ImageEditor.js
+++ b/src/ImageEditor.js
@@ -20,6 +20,8 @@ function ImageEditor(canvasId, args) {
             hideRulers: 'Hide Ruler',
             showFullscreen: 'Fullscreen',
             exitFullscreen: 'Exit Fullscreen',
+            cm: 'cm',
+            inch: 'inch'
         },
         // Default dimensions
         dimensions: {
diff --git a/src/RulerHandler.js b/src/RulerHandler.js
index 35640a9..31183dc 100644
--- a/src/RulerHandler.js
+++ b/src/RulerHandler.js
@@ -20,8 +20,13 @@ function RulerHandler(viewport) {
         if (axis === 'top') {
             dim = viewport.getData().dim.height - dim;
         }
-
-        ruler.setText(Math.round(dim * 100) / 100 + ' ' + viewport.getData().dim.units);
+        var units = viewport.getData().dim.units;
+        var value = Math.round(dim * 100) / 100;
+        if(units === 'cm') {
+            value = Math.round(value);
+        }
+        var label = viewport.canvas.__texts[units] || 'cm';
+        ruler.setText(value + ' ' + label);
     }
 
     var Event = {