diff --git a/media/src/api/api._selectors.js b/media/src/api/api._selectors.js
index 3b4c1fb4..8f5c4e33 100644
--- a/media/src/api/api._selectors.js
+++ b/media/src/api/api._selectors.js
@@ -61,7 +61,7 @@ var _selector_run = function ( selector, select )
 	}
 
 	for ( i=0, ien=selector.length ; i<ien ; i++ ) {
-		a = selector[i].split ?
+		a = selector[i] && selector[i].split ?
 			selector[i].split(',') :
 			[ selector[i] ];
 
@@ -337,3 +337,56 @@ var _column_selector = function ( settings, selector, opts )
 		}
 	} );
 };
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Cells
+ *
+ * {node}          - cell node
+ * "{string}"      - jquery selector to run on the nodes
+ *
+ */
+
+var _cell_selector = function ( settings, selector, opts )
+{
+	var data = settings.aoData;
+	var rows = _row_selector_indexes( settings, opts );
+	var cells = _pluck_order( data, rows, 'anCells' );
+	var allCells = $( [].concat.apply([], cells) );
+	var row;
+	var columns = settings.aoColumns.length;
+	var a, i, ien, j;
+
+	return _selector_run( selector, function ( s ) {
+		if ( ! s ) {
+			// All cells
+			a = [];
+
+			for ( i=0, ien=rows.length ; i<ien ; i++ ) {
+				row = rows[i];
+
+				for ( j=0 ; j<columns ; j++ ) {
+					a.push( {
+						row: row,
+						column: j
+					} );
+				}
+			}
+
+			return a;
+		}
+
+		// jQuery filtered cells
+		return allCells.filter( s ).map( function (i, el) {
+			row = el.parentNode._DT_RowIndex;
+
+			return {
+				row: row,
+				column: $.inArray( el, data[ row ].anCells )
+			};
+		} );
+	} );
+};
+
diff --git a/media/src/api/api.cells.js b/media/src/api/api.cells.js
index 7bfba6c4..d7174d41 100644
--- a/media/src/api/api.cells.js
+++ b/media/src/api/api.cells.js
@@ -6,6 +6,24 @@ var _api = DataTable.Api;
 
 
 _api.register( 'cells()', function ( rowSelector, columnSelector, opts ) {
+	// Argument shifting
+	if ( $.isPlainObject( rowSelector ) ) {
+		opts = rowSelector;
+		rowSelector = null;
+	}
+	if ( $.isPlainObject( columnSelector ) ) {
+		opts = columnSelector;
+		columnSelector = null;
+	}
+
+	// Cell selector
+	if ( columnSelector === null || columnSelector === undefined ) {
+		return this.iterator( 'table', function ( settings ) {
+			return _cell_selector( settings, rowSelector, _selector_opts( opts ) );
+		} );
+	}
+
+	// Row + column selector
 	var columns = this.columns( columnSelector, opts );
 	var rows = this.rows( rowSelector, opts );
 	var a, i, ien, j, jen;
@@ -74,17 +92,18 @@ _api.register( 'cell()', function ( rowSelector, columnSelector, opts ) {
 
 _api.register( 'cell().data()', function ( data ) {
 	var ctx = this.context;
+	var cell = this[0];
 
 	if ( data === undefined ) {
 		// Get
-		return ctx.length && this.length ?
-			_fnGetCellData( ctx[0], this[0].row, this[0].column ) :
+		return ctx.length && cell.length ?
+			_fnGetCellData( ctx[0], cell[0].row, cell[0].column ) :
 			undefined;
 	}
 
 	// Set
-	_fnSetCellData( ctx[0], this[0].row, this[0].column, data );
-	_fnInvalidateRow( ctx[0], this[0].row, 'data' );
+	_fnSetCellData( ctx[0], cell[0].row, cell[0].column, data );
+	_fnInvalidateRow( ctx[0], cell[0].row, 'data' );
 
 	return this;
 } );