diff --git a/src/Handlebars/Arguments.php b/src/Handlebars/Arguments.php
index 2143683..a3c07f0 100644
--- a/src/Handlebars/Arguments.php
+++ b/src/Handlebars/Arguments.php
@@ -109,7 +109,7 @@ protected function parse($args_string)
         $bad_chars = preg_quote(Context::NOT_VALID_NAME_CHARS, '#');
         $bad_seg_chars = preg_quote(Context::NOT_VALID_SEGMENT_NAME_CHARS, '#');
 
-        $name_chunk = '(?:[^' . $bad_chars . '\s]+)|(?:\[[^' . $bad_seg_chars . ']+\])';
+        $name_chunk = '(?:@?[^' . $bad_chars . '\s]+)|(?:\[[^' . $bad_seg_chars . ']+\])';
         $variable_name = '(?:\.\.\/)*(?:(?:' . $name_chunk . ')[\.\/])*(?:' . $name_chunk  . ')\.?';
         $special_variable_name = '@[a-z]+';
         $escaped_value = '(?:(?<!\\\\)".*?(?<!\\\\)"|(?<!\\\\)\'.*?(?<!\\\\)\')';
diff --git a/tests/Xamin/HandlebarsTest.php b/tests/Xamin/HandlebarsTest.php
index e5b20cf..c61e6d3 100644
--- a/tests/Xamin/HandlebarsTest.php
+++ b/tests/Xamin/HandlebarsTest.php
@@ -1251,6 +1251,7 @@ public function rootSpecialVariableProvider()
         return array(
             array('{{foo}} {{ @root.foo }}', array( 'foo' => 'bar' ), "bar bar"),
             array('{{@root.foo}} {{#each arr}}{{ @root.foo }}{{/each}}', array( 'foo' => 'bar', 'arr' => array( '1' ) ), "bar bar"),
+            array('{{add @root.one @root.two}}', array( 'one' => '1', 'two' => '2' ), "3"),
         );
     }
 
@@ -1268,6 +1269,15 @@ public function rootSpecialVariableProvider()
     public function testRootSpecialVariableHelpers($template, $data, $results)
     {
         $engine = new \Handlebars\Handlebars();
+        $engine->addHelper('add', function ($template, $context, $args) {
+            $sum = 0;
+
+            foreach ($template->parseArguments($args) as $value) {
+                $sum += intval($context->get($value));
+            }
+
+            return $sum;
+        });
 
         $res = $engine->render($template, $data);
         $this->assertEquals($res, $results);