diff --git a/clamp.js b/clamp.js
index f13e8ad..777bfe9 100644
--- a/clamp.js
+++ b/clamp.js
@@ -1,5 +1,5 @@
 /*!
-* Clamp.js 0.5.1
+* Clamp.js 0.5.2
 *
 * Copyright 2011-2013, Joseph Schmitt http://joe.sh
 * Released under the WTFPL license
@@ -74,7 +74,7 @@
          * on the current height of the element and the line-height of the text.
          */
         function getMaxLines(height) {
-            var availHeight = height || element.clientHeight,
+            var availHeight = height || getElemHeight(element),
                 lineHeight = getLineHeight(element);
 
             return Math.max(Math.floor(availHeight/lineHeight), 0);
@@ -101,6 +101,15 @@
             }
             return parseInt(lh);
         }
+		
+		/**
+         * Returns the height of an element as an integer (max of scroll/offset/client).
+		 * Note: inline elements return 0 for scrollHeight and clientHeight
+         */
+        function getElemHeight(elem) {
+            return Math.max(elem.scrollHeight, elem.offsetHeight, elem.clientHeight);
+        }
+		
 
 
 // MEAT AND POTATOES (MMMM, POTATOES...) ______________________________________
@@ -183,7 +192,7 @@
             //Search produced valid chunks
             if (chunks) {
                 //It fits
-                if (element.clientHeight <= maxHeight) {
+                if (getElemHeight(element) <= maxHeight) {
                     //There's still more characters to try splitting on, not quite done yet
                     if (splitOnChars.length >= 0 && splitChar != '') {
                         applyEllipsis(target, chunks.join(splitChar) + splitChar + lastChunk);
@@ -246,7 +255,7 @@
         }
         else {
             var height = getMaxHeight(clampValue);
-            if (height <= element.clientHeight) {
+            if (height <= getElemHeight(element)) {
                 clampedText = truncate(getLastChild(element), height);
             }
         }
diff --git a/clamp.min.js b/clamp.min.js
index 2d8783a..334f36a 100644
--- a/clamp.min.js
+++ b/clamp.min.js
@@ -1,12 +1,12 @@
 /*!
-* Clamp.js 0.5.1
+* Clamp.js 0.5.2
 *
 * Copyright 2011-2013, Joseph Schmitt http://joe.sh
 * Released under the WTFPL license
 * http://sam.zoy.org/wtfpl/
 */
-(function(){window.$clamp=function(c,d){function s(a,b){n.getComputedStyle||(n.getComputedStyle=function(a,b){this.el=a;this.getPropertyValue=function(b){var c=/(\-([a-z]){1})/g;"float"==b&&(b="styleFloat");c.test(b)&&(b=b.replace(c,function(a,b,c){return c.toUpperCase()}));return a.currentStyle&&a.currentStyle[b]?a.currentStyle[b]:null};return this});return n.getComputedStyle(a,null).getPropertyValue(b)}function t(a){a=a||c.clientHeight;var b=u(c);return Math.max(Math.floor(a/b),0)}function x(a){return u(c)*
-a}function u(a){var b=s(a,"line-height");"normal"==b&&(b=1.2*parseInt(s(a,"font-size")));return parseInt(b)}function l(a){if(a.lastChild.children&&0<a.lastChild.children.length)return l(Array.prototype.slice.call(a.children).pop());if(a.lastChild&&a.lastChild.nodeValue&&""!=a.lastChild.nodeValue&&a.lastChild.nodeValue!=b.truncationChar)return a.lastChild;a.lastChild.parentNode.removeChild(a.lastChild);return l(c)}function p(a,d){if(d){var e=a.nodeValue.replace(b.truncationChar,"");f||(h=0<k.length?
-k.shift():"",f=e.split(h));1<f.length?(q=f.pop(),r(a,f.join(h))):f=null;m&&(a.nodeValue=a.nodeValue.replace(b.truncationChar,""),c.innerHTML=a.nodeValue+" "+m.innerHTML+b.truncationChar);if(f){if(c.clientHeight<=d)if(0<=k.length&&""!=h)r(a,f.join(h)+h+q),f=null;else return c.innerHTML}else""==h&&(r(a,""),a=l(c),k=b.splitOnChars.slice(0),h=k[0],q=f=null);if(b.animate)setTimeout(function(){p(a,d)},!0===b.animate?10:b.animate);else return p(a,d)}}function r(a,c){a.nodeValue=c+b.truncationChar}d=d||{};
-var n=window,b={clamp:d.clamp||2,useNativeClamp:"undefined"!=typeof d.useNativeClamp?d.useNativeClamp:!0,splitOnChars:d.splitOnChars||[".","-","\u2013","\u2014"," "],animate:d.animate||!1,truncationChar:d.truncationChar||"\u2026",truncationHTML:d.truncationHTML},e=c.style,y=c.innerHTML,z="undefined"!=typeof c.style.webkitLineClamp,g=b.clamp,v=g.indexOf&&(-1<g.indexOf("px")||-1<g.indexOf("em")),m;b.truncationHTML&&(m=document.createElement("span"),m.innerHTML=b.truncationHTML);var k=b.splitOnChars.slice(0),
-h=k[0],f,q;"auto"==g?g=t():v&&(g=t(parseInt(g)));var w;z&&b.useNativeClamp?(e.overflow="hidden",e.textOverflow="ellipsis",e.webkitBoxOrient="vertical",e.display="-webkit-box",e.webkitLineClamp=g,v&&(e.height=b.clamp+"px")):(e=x(g),e<=c.clientHeight&&(w=p(l(c),e)));return{original:y,clamped:w}}})();
\ No newline at end of file
+(function(){window.$clamp=function(c,d){function t(a,b){n.getComputedStyle||(n.getComputedStyle=function(a,b){this.el=a;this.getPropertyValue=function(b){var c=/(\-([a-z]){1})/g;"float"==b&&(b="styleFloat");c.test(b)&&(b=b.replace(c,function(a,b,c){return c.toUpperCase()}));return a.currentStyle&&a.currentStyle[b]?a.currentStyle[b]:null};return this});return n.getComputedStyle(a,null).getPropertyValue(b)}function u(a){a=a||p(c);var b=v(c);return Math.max(Math.floor(a/b),0)}function y(a){return v(c)*
+a}function v(a){var b=t(a,"line-height");"normal"==b&&(b=1.2*parseInt(t(a,"font-size")));return parseInt(b)}function p(a){return Math.max(a.scrollHeight,a.offsetHeight,a.clientHeight)}function l(a){if(a.lastChild.children&&0<a.lastChild.children.length)return l(Array.prototype.slice.call(a.children).pop());if(a.lastChild&&a.lastChild.nodeValue&&""!=a.lastChild.nodeValue&&a.lastChild.nodeValue!=b.truncationChar)return a.lastChild;a.lastChild.parentNode.removeChild(a.lastChild);return l(c)}function q(a,
+d){if(d){var e=a.nodeValue.replace(b.truncationChar,"");f||(h=0<k.length?k.shift():"",f=e.split(h));1<f.length?(r=f.pop(),s(a,f.join(h))):f=null;m&&(a.nodeValue=a.nodeValue.replace(b.truncationChar,""),c.innerHTML=a.nodeValue+" "+m.innerHTML+b.truncationChar);if(f){if(p(c)<=d)if(0<=k.length&&""!=h)s(a,f.join(h)+h+r),f=null;else return c.innerHTML}else""==h&&(s(a,""),a=l(c),k=b.splitOnChars.slice(0),h=k[0],r=f=null);if(b.animate)setTimeout(function(){q(a,d)},!0===b.animate?10:b.animate);else return q(a,
+d)}}function s(a,c){a.nodeValue=c+b.truncationChar}d=d||{};var n=window,b={clamp:d.clamp||2,useNativeClamp:"undefined"!=typeof d.useNativeClamp?d.useNativeClamp:!0,splitOnChars:d.splitOnChars||[".","-","\u2013","\u2014"," "],animate:d.animate||!1,truncationChar:d.truncationChar||"\u2026",truncationHTML:d.truncationHTML},e=c.style,z=c.innerHTML,A="undefined"!=typeof c.style.webkitLineClamp,g=b.clamp,w=g.indexOf&&(-1<g.indexOf("px")||-1<g.indexOf("em")),m;b.truncationHTML&&(m=document.createElement("span"),
+m.innerHTML=b.truncationHTML);var k=b.splitOnChars.slice(0),h=k[0],f,r;"auto"==g?g=u():w&&(g=u(parseInt(g)));var x;A&&b.useNativeClamp?(e.overflow="hidden",e.textOverflow="ellipsis",e.webkitBoxOrient="vertical",e.display="-webkit-box",e.webkitLineClamp=g,w&&(e.height=b.clamp+"px")):(e=y(g),e<=p(c)&&(x=q(l(c),e)));return{original:z,clamped:x}}})();
\ No newline at end of file