diff --git a/src/selector.js b/src/selector.js
index 59ca2f6d5..56efd0174 100644
--- a/src/selector.js
+++ b/src/selector.js
@@ -6,7 +6,7 @@
  */
 (function(){
 
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]+['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
 	done = 0,
 	toString = Object.prototype.toString;
 
diff --git a/test/index.html b/test/index.html
index b5b80dd9b..7ded4855f 100644
--- a/test/index.html
+++ b/test/index.html
@@ -39,7 +39,7 @@
 		<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
 		<p id="ap">
 			Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>, 
-			<a id="groups" href="http://groups.google.com/">Google Groups</a>. 
+			<a id="groups" href="http://groups.google.com/">Google Groups (Link)</a>. 
 			This link has <code><a href="http://smin" id="anchor1">class="blog"</a></code>: 
 			<a href="http://diveintomark.org/" class="blog" hreflang="en" id="mark">diveintomark</a>
 
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 6057236a1..4bc15773f 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -197,7 +197,7 @@ test("child and adjacent", function() {
 });
 
 test("attributes", function() {
-	expect(27);
+	expect(34);
 	t( "Attribute Exists", "a[title]", ["google"] );
 	t( "Attribute Exists", "*[title]", ["google"] );
 	t( "Attribute Exists", "[title]", ["google"] );
@@ -221,6 +221,14 @@ test("attributes", function() {
 	if ( document.querySelectorAll ) {
 		results = ["radio1", "radio2", "hidden1"];
 	}
+
+	t( "Attribute containing []", "input[name^='foo[']", ["hidden2"] );
+	t( "Attribute containing []", "input[name^='foo[bar]']", ["hidden2"] );
+	t( "Attribute containing []", "input[name*='[bar]']", ["hidden2"] );
+	t( "Attribute containing []", "input[name$='bar]']", ["hidden2"] );
+	t( "Attribute containing []", "input[name$='[bar]']", ["hidden2"] );
+	t( "Attribute containing []", "input[name$='foo[bar]']", ["hidden2"] );
+	t( "Attribute containing []", "input[name*='foo[bar]']", ["hidden2"] );
 	
 	t( "Multiple Attribute Equals", "#form input[type='hidden'],#form input[type='radio']", results );
 	t( "Multiple Attribute Equals", "#form input[type=\"hidden\"],#form input[type='radio']", results );
@@ -244,7 +252,7 @@ test("attributes", function() {
 });
 
 test("pseudo (:) selectors", function() {
-	expect(51);
+	expect(53);
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Last Child", "p:last-child", ["sap"] );
 	t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
@@ -255,6 +263,10 @@ test("pseudo (:) selectors", function() {
 	t( "Selected Option Element", "#form option:selected", ["option1a","option2d","option3b","option3c"] );
 	t( "Text Contains", "a:contains('Google')", ["google","groups"] );
 	t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
+
+	t( "Text Contains", "a:contains('Google Groups (Link)')", ["groups"] );
+	t( "Text Contains", "a:contains('(Link)')", ["groups"] );
+
 	t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests","tabindex-tests"] );
 	t( "Not", "a.blog:not(.link)", ["mark"] );
 	t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d", "option3e"] );