diff --git a/Fields/Field.php b/Fields/Field.php
index 2a6ac4a..c35fd2a 100644
--- a/Fields/Field.php
+++ b/Fields/Field.php
@@ -86,9 +86,9 @@ public function __sleep()
     /**
      * Define an attribute
      */
-    public function setAttribute($name, $value)
+    public function setAttribute($name, $value, $quote = '"')
     {
-        $this->attributes[$name] = $value;
+        $this->attributes[$name] = ['value' => $value, 'quote' => $quote];
     }
 
     /**
@@ -122,7 +122,7 @@ public function unsetAttribute($name)
     /**
      * Function called by the dispatcher
      */
-    public function push($name, $value = null)
+    public function push($name, $value = null, $quote = '"')
     {
         switch ($name) {
         case 'name':
@@ -162,9 +162,9 @@ public function push($name, $value = null)
         default:
             if (preg_match('#^([a-z0-9_-]+)$#mUsi', $name)) {
                 if (null !== $value) {
-                    $this->setAttribute($name, $value);
+                    $this->setAttribute($name, $value, $quote);
                 } else {
-                    $this->setAttribute($name, $name);
+                    $this->setAttribute($name, $name, $quote);
                 }
             }
         }
@@ -314,7 +314,8 @@ public function getHtml()
         $html = '<input ';
 
         foreach ($this->attributes as $name => $value) {
-            $html.= $name.'="'.$value.'" ';
+            $quote = $value['quote'];
+            $html.= $name."={$quote}{$value['value']}{$quote} ";
         }
 
         if ($this->required) {
@@ -325,7 +326,8 @@ public function getHtml()
         $html.= 'name="'.$this->getName().'" ';
 
         if (($value = $this->getValue()) !== null && gettype($value) != 'object') {
-            $html.= 'value="'.htmlspecialchars($value).'" ';
+            $quote = $value['quote'];
+            $html.= "value={$quote}".htmlspecialchars($value)."{$quote}";
         }
 
         $html.= '/>';
diff --git a/Fields/Option.php b/Fields/Option.php
index 8a1a0cb..b3aa7bc 100644
--- a/Fields/Option.php
+++ b/Fields/Option.php
@@ -71,7 +71,8 @@ public function getOptionHtml($selected)
     {
         $html = '<option ';
         foreach ($this->attributes as $name => $value) {
-            $html.= $name.'="'.$value.'" ';
+            $quote = $value['quote'];
+            $html.= $name."={$quote}{$value['value']}{$quote} ";
         }
         if ($selected) {
             $html.='selected="selected" ';
diff --git a/Fields/Select.php b/Fields/Select.php
index c762d78..3ab672e 100644
--- a/Fields/Select.php
+++ b/Fields/Select.php
@@ -24,7 +24,7 @@ class Select extends Field
      */
     protected $options = array();
 
-    public function push($name, $value = null)
+    public function push($name, $value = null, $quote = '"')
     {
         if ($name == 'multiple') {
             $this->multiple = true;
@@ -33,7 +33,7 @@ public function push($name, $value = null)
             $this->allowAdd = true;
         }
 
-        parent::push($name, $value);
+        parent::push($name, $value, $quote);
     }
 
     public function __sleep()
@@ -130,7 +130,8 @@ public function getHtml()
 
         $html = '<select name="'.$this->getName().$arr.'" ';
         foreach ($this->attributes as $name => $value) {
-            $html.= $name.'="'.$value.'" ';
+            $quote = $value['quote'];
+            $html .= $name."={$quote}{$value['value']}{$quote} ";
         }
         $html.= ">\n";
 
diff --git a/Parser.php b/Parser.php
index c8dbefe..320c332 100644
--- a/Parser.php
+++ b/Parser.php
@@ -118,7 +118,7 @@ private function parse($content)
                                 }
 
                                 $this->push(new PostIndicator($name));
-                            } 
+                            }
 
                             $this->push('</form>');
                             break;
@@ -310,12 +310,15 @@ public function doParseTag(&$name, &$data)
                 $value = null;
             
                 if (isset($match[5])) {
+                    // Single quotes are being used
+                    $quote = "'";
                     $value = trim($match[5]);
                 } else if (isset($match[4])) {
+                    // Double quotes are being used
+                    $quote = '"';
                     $value = trim($match[4]);
                 }
-
-                $field->push($key, $value ? html_entity_decode($value) : $value);
+                $field->push($key, $value ? html_entity_decode($value) : $value, $quote);
             }, $data);
 
             return $field;