diff --git a/class.templater.php b/class.templater.php
index b78b4b9..821eee7 100644
--- a/class.templater.php
+++ b/class.templater.php
@@ -884,7 +884,7 @@ class TemplateInput extends TemplateStandaloneElement
 		
 		$argument_list = implode(" ", $this->tokens);
 		
-		if(preg_match_all('/([a-z]+)="([^"]+)"/', $argument_list, $matches, PREG_SET_ORDER))
+		if(preg_match_all('/([a-zA-Z0-9-]+)="([^"]+)"/', $argument_list, $matches, PREG_SET_ORDER))
 		{
 			foreach($matches as $argument)
 			{
@@ -902,6 +902,9 @@ class TemplateInput extends TemplateStandaloneElement
 					case "name":
 						$name = $argument[2];
 						break;
+					case "type":
+						$type = $argument[2];
+						break;
 					default:
 						$additional_list[$argument[1]] = $argument[2];
 				}