diff --git a/Mustache.php b/Mustache.php
index e1f69cd..48b4e1b 100644
--- a/Mustache.php
+++ b/Mustache.php
@@ -177,7 +177,7 @@ class Mustache {
 
 		$otag  = $this->prepareRegEx($this->otag);
 		$ctag  = $this->prepareRegEx($this->ctag);
-		$this->tagRegEx = '/' . $otag . "(#|\/|=|!|>|\\{|&)?([^\/#]+?)\\1?" . $ctag . "+/";
+		$this->tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/";
 		$html = '';
 		$matches = array();
 		while (preg_match($this->tagRegEx, $template, $matches, PREG_OFFSET_CAPTURE)) {
@@ -210,6 +210,7 @@ class Mustache {
 	protected function renderTag($modifier, $tag_name, &$context) {
 		switch ($modifier) {
 			case '#':
+			case '^':
 				if ($this->throwSectionExceptions) {
 					throw new MustacheException('Unclosed section: ' . $tag_name, MustacheException::UNCLOSED_SECTION);
 				} else {
@@ -310,7 +311,7 @@ class Mustache {
 
 		$otag  = $this->prepareRegEx($this->otag);
 		$ctag  = $this->prepareRegEx($this->ctag);
-		$this->tagRegEx = '/' . $otag . "(#|\/|=|!|>|\\{|&)?([^\/#\^]+?)\\1?" . $ctag . "+/";
+		$this->tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/";
 		return '';
 	}
 
diff --git a/examples/comments/comments.mustache b/examples/comments/comments.mustache
index b6feac8..846e449 100644
--- a/examples/comments/comments.mustache
+++ b/examples/comments/comments.mustache
@@ -1 +1 @@
-<h1>{{title}}{{! just something interesting... or not... }}</h1>
\ No newline at end of file
+<h1>{{title}}{{! just something interesting... #or ^not... }}</h1>
\ No newline at end of file