diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5c73b19
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/ExpandingTextareas"]
+	path = lib/ExpandingTextareas
+	url = https://github.com/bgrins/ExpandingTextareas
diff --git a/docs/index.html b/docs/index.html
index 1c189ef..44850ed 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -8,8 +8,8 @@
   <link href='assets/style.css' rel='stylesheet' type='text/css'>
   <link href='../jquery.mentionsInput.css' rel='stylesheet' type='text/css'>
 
-  <script src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js' type='text/javascript'></script>
-  <script src='http://documentcloud.github.com/underscore/underscore-min.js' type='text/javascript'></script>
+  <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js' type='text/javascript'></script>
+  <script src='http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.2/underscore-min.js' type='text/javascript'></script>
 </head>
 <body>
 
@@ -246,14 +246,12 @@ <h2>Change Log</h2>
   </div>
 
   <script src='../lib/jquery.events.input.js' type='text/javascript'></script>
-  <script src='../lib/jquery.elastic.js' type='text/javascript'></script>
+  <script src='../lib/ExpandingTextareas/expanding.js' type='text/javascript'></script>
   <script src='../jquery.mentionsInput.js' type='text/javascript'></script>
   <script src='assets/examples.js' type='text/javascript'></script>
   <script src='assets/examples-prepop.js' type='text/javascript'></script>
   <script src='assets/example2.js' type='text/javascript'></script>
 
-  <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-
   <script type="text/javascript">
 
     var _gaq = _gaq || [];
diff --git a/jquery.mentionsInput.js b/jquery.mentionsInput.js
index 24205a9..1d8be38 100644
--- a/jquery.mentionsInput.js
+++ b/jquery.mentionsInput.js
@@ -39,7 +39,6 @@
     onDataRequest : $.noop,
     minChars      : 2,
     showAvatars   : true,
-    elastic       : true,
     useCurrentVal : true,
     display       : 'name',
     defaultTriggerChar  : '',
@@ -142,10 +141,7 @@
       elmInputBox.bind('click', onInputBoxClick);
       elmInputBox.bind('blur', onInputBoxBlur);
 
-      // Elastic textareas, internal setting for the Dispora guys
-      if( settings.elastic ) {
-        elmInputBox.elastic();
-      }
+      elmInputBox.expandingTextarea();
 
     }
 
diff --git a/lib/ExpandingTextareas b/lib/ExpandingTextareas
new file mode 160000
index 0000000..0306aa7
--- /dev/null
+++ b/lib/ExpandingTextareas
@@ -0,0 +1 @@
+Subproject commit 0306aa77d30093a5e3f76b0d2ac3485c28d48841
diff --git a/lib/jquery.elastic.js b/lib/jquery.elastic.js
deleted file mode 100644
index c5e857f..0000000
--- a/lib/jquery.elastic.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
-*  @name							Elastic
-*	@descripton						Elastic is jQuery plugin that grow and shrink your textareas automatically
-*	@version						1.6.11
-*	@requires						jQuery 1.2.6+
-*
-*	@author							Jan Jarfalk
-*	@author-email					jan.jarfalk@unwrongest.com
-*	@author-website					http://www.unwrongest.com
-*
-*	@licence						MIT License - http://www.opensource.org/licenses/mit-license.php
-*/
-
-(function($){ 
-	jQuery.fn.extend({  
-		elastic: function() {
-		
-			//	We will create a div clone of the textarea
-			//	by copying these attributes from the textarea to the div.
-			var mimics = [
-				'paddingTop',
-				'paddingRight',
-				'paddingBottom',
-				'paddingLeft',
-				'fontSize',
-				'lineHeight',
-				'fontFamily',
-				'width',
-				'fontWeight',
-				'border-top-width',
-				'border-right-width',
-				'border-bottom-width',
-				'border-left-width',
-				'borderTopStyle',
-				'borderTopColor',
-				'borderRightStyle',
-				'borderRightColor',
-				'borderBottomStyle',
-				'borderBottomColor',
-				'borderLeftStyle',
-				'borderLeftColor'
-				];
-			
-			return this.each( function() {
-
-				// Elastic only works on textareas
-				if ( this.type !== 'textarea' ) {
-					return false;
-				}
-					
-			var $textarea	= jQuery(this),
-				$twin		= jQuery('<div />').css({
-					'position'		: 'absolute',
-					'display'		: 'none',
-					'word-wrap'		: 'break-word',
-					'white-space'	:'pre-wrap'
-				}),
-				lineHeight	= parseInt($textarea.css('line-height'),10) || parseInt($textarea.css('font-size'),'10'),
-				minheight	= parseInt($textarea.css('height'),10) || lineHeight*3,
-				maxheight	= parseInt($textarea.css('max-height'),10) || Number.MAX_VALUE,
-				goalheight	= 0;
-				
-				// Opera returns max-height of -1 if not set
-				if (maxheight < 0) { maxheight = Number.MAX_VALUE; }
-					
-				// Append the twin to the DOM
-				// We are going to meassure the height of this, not the textarea.
-				$twin.appendTo($textarea.parent());
-				
-				// Copy the essential styles (mimics) from the textarea to the twin
-				var i = mimics.length;
-				while(i--){
-					$twin.css(mimics[i].toString(),$textarea.css(mimics[i].toString()));
-				}
-				
-				// Updates the width of the twin. (solution for textareas with widths in percent)
-				function setTwinWidth(){
-					var curatedWidth = Math.floor(parseInt($textarea.width(),10));
-					if($twin.width() !== curatedWidth){
-						$twin.css({'width': curatedWidth + 'px'});
-						
-						// Update height of textarea
-						update(true);
-					}
-				}
-				
-				// Sets a given height and overflow state on the textarea
-				function setHeightAndOverflow(height, overflow){
-				
-					var curratedHeight = Math.floor(parseInt(height,10));
-					if($textarea.height() !== curratedHeight){
-						$textarea.css({'height': curratedHeight + 'px','overflow':overflow});
-					}
-				}
-				
-				// This function will update the height of the textarea if necessary 
-				function update(forced) {
-					
-					// Get curated content from the textarea.
-					var textareaContent = $textarea.val().replace(/&/g,'&amp;').replace(/ {2}/g, '&nbsp;').replace(/<|>/g, '&gt;').replace(/\n/g, '<br />');
-					
-					// Compare curated content with curated twin.
-					var twinContent = $twin.html().replace(/<br>/ig,'<br />');
-					
-					if(forced || textareaContent+'&nbsp;' !== twinContent){
-					
-						// Add an extra white space so new rows are added when you are at the end of a row.
-						$twin.html(textareaContent+'&nbsp;');
-						
-						// Change textarea height if twin plus the height of one line differs more than 3 pixel from textarea height
-						if(Math.abs($twin.height() + lineHeight - $textarea.height()) > 3){
-							
-							var goalheight = $twin.height()+lineHeight;
-							if(goalheight >= maxheight) {
-								setHeightAndOverflow(maxheight,'auto');
-							} else if(goalheight <= minheight) {
-								setHeightAndOverflow(minheight,'hidden');
-							} else {
-								setHeightAndOverflow(goalheight,'hidden');
-							}
-							
-						}
-						
-					}
-					
-				}
-				
-				// Hide scrollbars
-				$textarea.css({'overflow':'hidden'});
-				
-				// Update textarea size on keyup, change, cut and paste
-				$textarea.bind('keyup change cut paste', function(){
-					update(); 
-				});
-				
-				// Update width of twin if browser or textarea is resized (solution for textareas with widths in percent)
-				$(window).bind('resize', setTwinWidth);
-				$textarea.bind('resize', setTwinWidth);
-				$textarea.bind('update', update);
-				
-				// Compact textarea on blur
-				$textarea.bind('blur',function(){
-					if($twin.height() < maxheight){
-						if($twin.height() > minheight) {
-							$textarea.height($twin.height());
-						} else {
-							$textarea.height(minheight);
-						}
-					}
-				});
-				
-				// And this line is to catch the browser paste event
-				$textarea.bind('input paste',function(e){ setTimeout( update, 250); });				
-				
-				// Run update once when elastic is initialized
-				update();
-				
-			});
-			
-        } 
-    }); 
-})(jQuery);
\ No newline at end of file
