diff --git a/VERSION b/VERSION
index 9084fa2f..26aaba0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+1.2.0
diff --git a/dist/ember-i18n-1.0.0.js b/dist/ember-i18n-1.0.0.js
deleted file mode 100644
index b869b7a1..00000000
--- a/dist/ember-i18n-1.0.0.js
+++ /dev/null
@@ -1,102 +0,0 @@
-(function() {
-  var I18n, isBinding, isTranslatedAttribute;
-
-  isTranslatedAttribute = /(.+)Translation$/;
-
-  I18n = {
-    compile: Handlebars.compile,
-    translations: {},
-    template: function(key) {
-      var result;
-      sc_assert("You must provide a translation key string, not %@".fmt(key), typeof key === 'string');
-      result = I18n.translations[key];
-      if (result == null) {
-        result = I18n.translations[key] = I18n.compile("Missing translation: " + key);
-      }
-      if (!$.isFunction(result)) {
-        result = I18n.translations[key] = I18n.compile(result);
-      }
-      return result;
-    },
-    t: function(key, context) {
-      var template;
-      template = I18n.template(key);
-      return template(context);
-    },
-    TranslateableAttributes: Em.Mixin.create({
-      didInsertElement: function() {
-        var attribute, isTranslatedAttributeMatch, key, path, result, translatedValue;
-        result = this._super.apply(this, arguments);
-        for (key in this) {
-          path = this[key];
-          isTranslatedAttributeMatch = key.match(isTranslatedAttribute);
-          if (isTranslatedAttributeMatch) {
-            attribute = isTranslatedAttributeMatch[1];
-            translatedValue = I18n.t(path);
-            this.$().attr(attribute, translatedValue);
-          }
-        }
-        return result;
-      }
-    })
-  };
-
-  SC.I18n = I18n;
-
-  Em.I18n = I18n;
-
-  Ember.I18n = I18n;
-
-  isBinding = /(.+)Binding$/;
-
-  Handlebars.registerHelper('t', function(key, options) {
-    var attrs, context, elementID, result, tagName, view;
-    context = this;
-    attrs = options.hash;
-    view = options.data.view;
-    tagName = attrs.tagName || 'span';
-    delete attrs.tagName;
-    elementID = "i18n-" + (jQuery.uuid++);
-    Em.keys(attrs).forEach(function(property) {
-      var bindPath, currentValue, invoker, isBindingMatch, observer, propertyName;
-      isBindingMatch = property.match(isBinding);
-      if (isBindingMatch) {
-        propertyName = isBindingMatch[1];
-        bindPath = attrs[property];
-        currentValue = Em.getPath(bindPath);
-        attrs[propertyName] = currentValue;
-        invoker = null;
-        observer = function() {
-          var elem, newValue;
-          newValue = Em.getPath(context, bindPath);
-          elem = view.$("#" + elementID);
-          if (elem.length === 0) {
-            Em.removeObserver(context, bindPath, invoker);
-            return;
-          }
-          attrs[propertyName] = newValue;
-          return elem.html(I18n.t(key, attrs));
-        };
-        invoker = function() {
-          return Em.run.once(observer);
-        };
-        return Em.addObserver(context, bindPath, invoker);
-      }
-    });
-    result = '<%@ id="%@">%@</%@>'.fmt(tagName, elementID, I18n.t(key, attrs), tagName);
-    return new Handlebars.SafeString(result);
-  });
-
-  Handlebars.registerHelper('translateAttr', function(options) {
-    var attrs, result;
-    attrs = options.hash;
-    result = [];
-    Em.keys(attrs).forEach(function(property) {
-      var translatedValue;
-      translatedValue = I18n.t(attrs[property]);
-      return result.push('%@="%@"'.fmt(property, translatedValue));
-    });
-    return new Handlebars.SafeString(result.join(' '));
-  });
-
-}).call(this);
diff --git a/dist/ember-i18n-1.1.0.js b/dist/ember-i18n-1.2.0.js
similarity index 72%
rename from dist/ember-i18n-1.1.0.js
rename to dist/ember-i18n-1.2.0.js
index 1da94126..342e7b71 100644
--- a/dist/ember-i18n-1.1.0.js
+++ b/dist/ember-i18n-1.2.0.js
@@ -1,28 +1,47 @@
 (function() {
-  var I18n, getPath, isBinding, isTranslatedAttribute;
+  var I18n, findTemplate, getPath, isBinding, isTranslatedAttribute, pluralForm;
 
   isTranslatedAttribute = /(.+)Translation$/;
 
   getPath = Ember.Handlebars.getPath || Ember.getPath;
 
-  I18n = {
-    compile: Handlebars.compile,
-    translations: {},
-    template: function(key) {
-      var result;
-      sc_assert("You must provide a translation key string, not %@".fmt(key), typeof key === 'string');
-      result = I18n.translations[key];
+  if (typeof CLDR !== "undefined" && CLDR !== null) pluralForm = CLDR.pluralForm;
+
+  if (pluralForm == null) {
+    Ember.Logger.warn("CLDR.pluralForm not found. Em.I18n will not support count-based inflection.");
+  }
+
+  findTemplate = function(key, setOnMissing) {
+    var result;
+    ember_assert("You must provide a translation key string, not %@".fmt(key), typeof key === 'string');
+    result = I18n.translations[key];
+    if (setOnMissing) {
       if (result == null) {
         result = I18n.translations[key] = I18n.compile("Missing translation: " + key);
       }
-      if (!$.isFunction(result)) {
-        result = I18n.translations[key] = I18n.compile(result);
+    }
+    if ((result != null) && !$.isFunction(result)) {
+      result = I18n.translations[key] = I18n.compile(result);
+    }
+    return result;
+  };
+
+  I18n = {
+    compile: Handlebars.compile,
+    translations: {},
+    template: function(key, count) {
+      var interpolatedKey, result, suffix;
+      if ((count != null) && (pluralForm != null)) {
+        suffix = pluralForm(count);
+        interpolatedKey = "%@.%@".fmt(key, suffix);
+        result = findTemplate(interpolatedKey, false);
       }
-      return result;
+      return result != null ? result : result = findTemplate(key, true);
     },
     t: function(key, context) {
       var template;
-      template = I18n.template(key);
+      if (context == null) context = {};
+      template = I18n.template(key, context.count);
       return template(context);
     },
     TranslateableAttributes: Em.Mixin.create({