diff --git a/Functions/Public/base.ps1 b/Functions/Public/base.ps1
index 0862eaa4..e77426cd 100644
--- a/Functions/Public/base.ps1
+++ b/Functions/Public/base.ps1
@@ -63,10 +63,13 @@ Function base {
 
             }
 
-            Set-HtmlTag -TagName $tagname -Attributes $htmltagparams -TagType nonVoid
+            if($Attributes){
+                $htmltagparams += $Attributes
+            }
+
         }
+        Set-HtmlTag -TagName $tagname -Attributes $htmltagparams -TagType nonVoid
 
 
 
 }
-
diff --git a/Functions/Public/blockquote.ps1 b/Functions/Public/blockquote.ps1
index 651b3975..3a65626c 100644
--- a/Functions/Public/blockquote.ps1
+++ b/Functions/Public/blockquote.ps1
@@ -20,6 +20,7 @@ Function blockquote {
     .NOTES
     Current version 2.0
        History:
+            2018.10.02;@stephanevg;Fixed error when no content passed. to version 2.0
             2018.10.02;bateskevin;updated to version 2.0
             2018.05.07;stephanevg;updated to version 1.0
             2018.04.01;bateskevinhanevg;Creation.
@@ -28,7 +29,7 @@ Function blockquote {
     #>
     [Cmdletbinding()]
     Param(
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory=$false)]
         [AllowEmptyString()]
         [AllowNull()]
         [String]
@@ -80,7 +81,7 @@ Function blockquote {
             }
 
 
-            Set-HtmlTag -TagName $tagname -Attributes $htmltagparams -TagType NonVoid   
         }
+         Set-HtmlTag -TagName $tagname -Attributes $htmltagparams -TagType NonVoid   
     }
 }
\ No newline at end of file
diff --git a/Functions/Public/datalist.ps1 b/Functions/Public/datalist.ps1
new file mode 100644
index 00000000..b2558090
--- /dev/null
+++ b/Functions/Public/datalist.ps1
@@ -0,0 +1,83 @@
+Function datalist {
+    <#
+    .SYNOPSIS
+    Create a datalist tag in an HTML document.
+
+    .DESCRIPTION
+
+    The <datalist> tag specifies a list of pre-defined options for an <input> element.
+
+    The <datalist> tag is used to provide an "autocomplete" feature on <input> elements. Users will see a drop-down list of pre-defined options as they input data.
+
+    Use the <input> element's list attribute to bind it together with a <datalist> element.
+
+    .EXAMPLE
+    
+    .EXAMPLE
+    
+
+    .NOTES
+    Current version 2.0
+       History:
+            2018.10.05;@stephanevg;Creation.
+    .LINK
+        https://github.com/Stephanevg/PSHTML
+    #>
+    [Cmdletbinding()]
+    Param(
+        [Parameter(Mandatory=$false)]
+        [AllowEmptyString()]
+        [AllowNull()]
+        [String]
+        $Content,
+
+        [string]$cite,
+
+        [AllowEmptyString()]
+        [AllowNull()]
+        [String]$Class="",
+
+        [String]$Id,
+
+        [AllowEmptyString()]
+        [AllowNull()]
+        [String]$Style,
+
+        [String]$title,
+
+        [Hashtable]$Attributes
+    )
+
+    Process {
+
+        $CommonParameters = "tagname" + [System.Management.Automation.PSCmdlet]::CommonParameters + [System.Management.Automation.PSCmdlet]::OptionalCommonParameters
+        $CustomParameters = $PSBoundParameters.Keys | ? { $_ -notin $CommonParameters }
+        
+        $htmltagparams = @{}
+        $tagname = "datalist"
+
+        if($CustomParameters){
+
+            foreach ($entry in $CustomParameters){
+
+
+                if($entry -eq "content"){
+
+                    
+                    $htmltagparams.$entry = $PSBoundParameters[$entry]
+                }else{
+                    $htmltagparams.$entry = "{0}" -f $PSBoundParameters[$entry]
+                }
+                
+    
+            }
+
+            if($Attributes){
+                $htmltagparams += $Attributes
+            }
+
+
+            Set-HtmlTag -TagName $tagname -Attributes $htmltagparams -TagType NonVoid   
+        }
+    }
+}
\ No newline at end of file
diff --git a/Functions/Public/dl.ps1 b/Functions/Public/dl.ps1
index b7ec62fc..808869a3 100644
--- a/Functions/Public/dl.ps1
+++ b/Functions/Public/dl.ps1
@@ -27,7 +27,6 @@ Function dl {
         [Parameter(Mandatory=$false,position=0)]
         [AllowEmptyString()]
         [AllowNull()]
-        [String]
         $Content,
 
         [Parameter(Position = 1)]
diff --git a/Functions/Public/option.ps1 b/Functions/Public/option.ps1
new file mode 100644
index 00000000..ba9283e5
--- /dev/null
+++ b/Functions/Public/option.ps1
@@ -0,0 +1,103 @@
+Function option {
+    <#
+    .SYNOPSIS
+    Create a <option> tag in an HTML document.
+
+    .DESCRIPTION
+
+    The <option> tag defines an option in a select list.
+
+    <option> elements go inside a <select> or <datalist> element.
+
+
+    .EXAMPLE
+    
+        
+    datalist {
+        option -value "Volvo" -Content "Volvo" 
+        option -value Saab -Content "saab"
+    }
+
+
+    Generates the following code:
+
+    <datalist>
+        <option value="Volvo"  >volvo</option>
+        <option value="Saab"  >saab</option>
+    </datalist>
+
+
+    .EXAMPLE
+    
+
+    .NOTES
+    Current version 2.0
+       History:
+            2018.10.05;@stephanevg;Creation.
+    .LINK
+        https://github.com/Stephanevg/PSHTML
+    #>
+    [Cmdletbinding()]
+    Param(
+        [Parameter(Mandatory=$false)]
+        [AllowEmptyString()]
+        [AllowNull()]
+        $Content,
+
+        [string]$value,
+
+        [string]$label,
+
+        [Switch]$Disabled,
+
+        [Switch]$Selected,
+
+        [AllowEmptyString()]
+        [AllowNull()]
+        [String]$Class="",
+
+        [String]$Id,
+
+        [AllowEmptyString()]
+        [AllowNull()]
+        [String]$Style,
+
+        [String]$title,
+
+        [Hashtable]$Attributes
+    )
+
+    Process {
+
+        $CommonParameters = "tagname" + [System.Management.Automation.PSCmdlet]::CommonParameters + [System.Management.Automation.PSCmdlet]::OptionalCommonParameters
+        $CustomParameters = $PSBoundParameters.Keys | ? { $_ -notin $CommonParameters }
+        
+        $htmltagparams = @{}
+        $tagname = "option"
+
+        if($CustomParameters){
+
+            foreach ($entry in $CustomParameters){
+
+
+                if($entry -eq "content"){
+
+                    
+                    $htmltagparams.$entry = $PSBoundParameters[$entry]
+                }else{
+                    $htmltagparams.$entry = "{0}" -f $PSBoundParameters[$entry]
+                }
+                
+    
+            }
+
+            if($Attributes){
+                $htmltagparams += $Attributes
+            }
+
+
+        }
+        Set-HtmlTag -TagName $tagname -Attributes $htmltagparams -TagType NonVoid   
+    }
+}
+
diff --git a/README.md b/README.md
index e8a60a02..9002b3c6 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Module to generate HTML markup language within a DSL.
 
 Usinng PSHTML, offers code completition and syntax highliting from the the default powershell langauge. As PSHTML respects the W3C standards, any HTML errors, will be spotted immediatly.
 
-## A few Basic examples
+## A few Basic examples of what PSHTML can achieve
 
 ### Basic page
 
@@ -174,13 +174,19 @@ In parallel to this, I want to add the support for the following attributes (as
 
 
 Eventually, the following components will also be added:
- - [ ] Scripts
- - [ ] Include Sections
+ - [X] Scripts
+ - [X] Include Sections
  - [ ] Interactive Data
 
 Each function has an additional parameter called: ```Attributes``` of type HashTable.
-It allow to add additional html tags without having to list ALL the existing attributes. It offers flexibility for custom and/or special htmls attributes.
+It allow to add additional html tags without having to list ALL the existing attributes. It offers flexibility for custom and/or special htmls attributes, or the ones that are not immediatly available to you. (Open an issue, if you want to have an additional parameter for a specific html element. Or, you could add it your self, since this is an open sourced project ;) (Read 'contributing' part here under.
 
 ## HTML 5 coverage
 
 I would like to have all HTML 5 tags available in PSHTML ASAP. The list is currently ongoing, and this is work in progress. It can be followed [here](https://github.com/Stephanevg/PSHTML/issues/7)
+
+## Contributing
+
+Read how you can `contribute` to `pshtml`by reading the [contributing](/CONTRIBUTING.md) document.
+
+
diff --git a/Tests/datalist.tests.ps1 b/Tests/datalist.tests.ps1
new file mode 100644
index 00000000..345e464f
--- /dev/null
+++ b/Tests/datalist.tests.ps1
@@ -0,0 +1,65 @@
+$TestsPath = Split-Path $MyInvocation.MyCommand.Path
+
+#$FunctionsPath = join-Path -Path (get-item $TestsPath).Parent -ChildPath "Functions"
+
+$RootFolder = (get-item $TestsPath).Parent
+
+Push-Location -Path $RootFolder.FullName
+
+set-location -Path $RootFolder.FullName
+
+Write-Verbose "Importing module"
+
+import-module .\PSHTML -Force
+
+Context "Testing PSHTML"{
+    Describe "Testing datalist" {
+
+
+        $Class = "MyClass"
+        $Id = "MyID"
+        $Style = "Background:green"
+        $CustomAtt = @{"MyAttribute1"='MyValue1';"MyAttribute2"="MyValue2"}
+        $string = datalist {woop} -Attributes $CustomAtt -Style $Style -Class $class -id $id
+
+        if($string -is [array]){
+            $string = $String -join ""
+        }
+
+        it "Should contain opening and closing tags" {
+            $string -match '^<datalist.*>' | should be $true
+            $string -match '.*</datalist>$' | should be $true
+
+        }
+
+        it "Testing content in child element"{
+            $string -match "^.*>woop<.*" | should be $true
+        }
+
+        it "Testing common parameters: Class"{
+            $string -match '^<datalist.*class="myclass".*>' | should be $true
+        }
+        it "Testing common parameters: ID"{
+            $string -match '^<datalist.*id="myid".*>' | should be $true
+        }
+        it "Testing common parameters: Style"{
+            $string -match '^<datalist.*style=".+".*>' | should be $true
+        }
+
+        it "Testing Attributes parameters"{
+
+            foreach($at in $CustomAtt.Keys){
+                $val = $null
+                $val = $CustomAtt[$at]
+                $string -match "^<datalist.*$at=`"$val`".*>" | should be $true
+            }
+
+
+        }
+
+
+    }
+
+}
+
+Pop-Location
\ No newline at end of file
diff --git a/Tests/option.tests.ps1 b/Tests/option.tests.ps1
new file mode 100644
index 00000000..7a5f16b4
--- /dev/null
+++ b/Tests/option.tests.ps1
@@ -0,0 +1,74 @@
+$TestsPath = Split-Path $MyInvocation.MyCommand.Path
+
+#$FunctionsPath = join-Path -Path (get-item $TestsPath).Parent -ChildPath "Functions"
+
+$RootFolder = (get-item $TestsPath).Parent
+
+Push-Location -Path $RootFolder.FullName
+
+set-location -Path $RootFolder.FullName
+
+Write-Verbose "Importing module"
+
+import-module .\PSHTML -Force
+
+Context "Testing PSHTML"{
+    Describe "Testing option" {
+
+
+        $Class = "MyClass"
+        $Id = "MyID"
+        $Style = "Background:green"
+        $CustomAtt = @{"MyAttribute1"='MyValue1';"MyAttribute2"="MyValue2"}
+        $string = option {"woop"} -Attributes $CustomAtt -Style $Style -Class $class -id $id
+
+        if($string -is [array]){
+            $string = $String -join ""
+        }
+
+        it "Should contain opening and closing tags" {
+            $string -match '^<option.*>' | should be $true
+            $string -match '.*</option>$' | should be $true
+
+        }
+
+        it "Testing content in child element"{
+            $string -match "^.*>woop<.*" | should be $true
+        }
+
+        it "Testing common parameters: Class"{
+            $string -match '^<option.*class="myclass".*>' | should be $true
+        }
+        it "Testing common parameters: ID"{
+            $string -match '^<option.*id="myid".*>' | should be $true
+        }
+        it "Testing common parameters: Style"{
+            $string -match '^<option.*style=".+".*>' | should be $true
+        }
+
+        it "Testing Attributes parameters"{
+
+            foreach($at in $CustomAtt.Keys){
+                $val = $null
+                $val = $CustomAtt[$at]
+                $string -match "^<option.*$at=`"$val`".*>" | should be $true
+            }
+
+
+        }
+
+        it 'Testing: -Content Parameter should expand child elements' {
+            
+            $string2 = option {em "Expanded" }
+            $String2 = $string2 -join ""
+            
+                $string2 -match '^.*>.*<em.*>.*Expanded.*<.*' | should be $true
+            
+        }
+
+
+    }
+
+}
+
+Pop-Location
\ No newline at end of file
diff --git a/pshtml.psd1 b/pshtml.psd1
index cf0bf4e5..9fb1d460 100644
--- a/pshtml.psd1
+++ b/pshtml.psd1
@@ -12,7 +12,7 @@
 RootModule = 'pshtml.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.5.17'
+ModuleVersion = '0.5.18'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()