diff --git a/README.md b/README.md
index 6bb1a66..ca7beb9 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,76 @@
-# PSCredentialStore
\ No newline at end of file
+| AppVeyor Overall | AppVeyor Master | AppVeyor Dev | Coveralls.io  | Download |
+| :--------------: | :-------------: | :----------: | :-----------: | :--------:|
+| [![Build status](https://ci.appveyor.com/api/projects/status/b4t8x88xai3ee7gk?svg=true)](https://ci.appveyor.com/project/OCram85/PSCredentialStore) | [![Build status](https://ci.appveyor.com/api/projects/status/b4t8x88xai3ee7gk/branch/master?svg=true)](https://ci.appveyor.com/project/OCram85/PSCredentialStore/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/b4t8x88xai3ee7gk/branch/dev?svg=true)](https://ci.appveyor.com/project/OCram85/PSCredentialStore/branch/dev) | [![Coverage Status](https://coveralls.io/repos/github/OCram85/PSCredentialStore/badge.svg?branch=master)](https://coveralls.io/github/OCram85/PSCredentialStore?branch=master) | [![Download](https://img.shields.io/badge/powershellgallery-PSCredentialStore-blue.svg)](https://www.powershellgallery.com/packages/PSCredentialStore)
+
+General
+=======
+
+The PSCredentialStore is an simple credential manager for PSCredentials. It stores multiple credential object in a
+simple json file. Either as private file in your profile or in shared mode in other locations.
+
+PSCredentialStore was developed to simplify the delegation of complex powershell scripts. In this case you often
+need to store credentials for non interactive usage like in sheduled tasks.
+
+To get started read the [about_PSCredentialStore](/src/en-US/about_PSCredential.help.txt) page.
+
+Installation
+============
+
+
+PowerShellGallery.com (Recommended Way)
+---------------------------------------
+
+* Make sure you use PowerShell 4.0 or higher with `$PSVersionTable`.
+* Use the builtin PackageManagement and install with: `Install-Module PSCredentialStore`
+* Done. Start exploring the Module with `Import-Module PSCredentialStore ; Get-Command -Module PSCredentialStore`
+
+Manual Way
+----------
+
+* Take a look at the [Latest Release](https://github.com/OCram85/PSCredentialStore/releases/latest) page.
+* Download the `PSCredentialStore.zip`.
+* Unpack the Zip and put it in your Powershell Module path.
+  * Don't forget to change the NTFS permission flag in the context menu.
+* Start with `Import-Module PSCredentialStore`
+
+Quick Start
+-----
+
+**1.** First we need a blank CredentialStore. You can decide between a *private* or *shared* store. The private
+Credential Store can only be accessed with your profile on the machine you created it.
+```powershell
+# Private Credential Store
+New-CredentialStore
+
+# Shared Credential Store
+New-CredentialStore -Shared
+
+#Shared CredentialStore in custom Location
+New-CredentialStore -Shared -Path 'C:\CredentialStore.json'
+```
+
+**2.** Now you can manage your CredentialStoreItems:
+```powershell
+# This will prompt for credentials and stores it in a private store
+New-CredentialStoreItem -RemoteHost 'dc01.myside.local' -Identifier 'AD'
+
+# You can now use it in other scripts like this:
+$DCCreds = Get-CredentialStoreItem -RemoteHost 'dc01.myside.local' -Identifier 'AD'
+Invoke-Command -ComputerName 'dc01.myside.local' -Credential $DCCreds -ScripBlock {Get-Process}
+```
+
+The CredentialStore contains also a simple function to establish a connection with the given remotehost in different
+ways. If you have already installed the underlying framework your can conntect to:
+  - CiscoUcs - Establish a connection to a Cisco UCS fabric interconnect.
+  - FTP - Establish a connection to a FTP host.
+  - NetAppFAS - Establish a connection to a NetApp Clustered ONTAP filer.
+  - VMware - Establish a connection to a VMware vCenter or ESXi host.
+
+Here are some basic examples:
+
+```powershell
+Connect-To -RemoteHost "ucs.myside.local" -Type CiscoUcs
+Connect-To -RemoteHost "ftp.myside.local" -Type FTP
+Connect-To -RemoteHost "fas.myside.local" -Type NetAppFAS
+Connect-To -RemoteHost "esx01.myside.local" -Type VMware
+```
diff --git a/tests/Item/01_New-CredentialStoreItem.Tests.ps1 b/tests/Item/01_New-CredentialStoreItem.Tests.ps1
new file mode 100644
index 0000000..9624c2b
--- /dev/null
+++ b/tests/Item/01_New-CredentialStoreItem.Tests.ps1
@@ -0,0 +1,65 @@
+#region HEADER
+$here = Split-Path -Parent $MyInvocation.MyCommand.Path
+# $RepoRoot = (Get-Item -Path $here).Parent.Parent.FullName
+$RepoRoot = (Get-GitDirectory).replace('\.git', '')
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path) -replace '\.Tests\.', '.'
+$sut = $sut -replace "\d{2}`_", ''
+$suthome = (Get-ChildItem -Path $RepoRoot -Exclude ".\tests\" -Filter $sut -Recurse).FullName
+# Skip try loading the source file if it doesn't exists.
+If ($suthome.Length -gt 0) {
+    . $suthome
+}
+Else {
+    Write-Warning ("Could not find source file {0}" -f $sut)
+}
+
+# load additional functions defined in the repository. Replace the expression <FunctionName>.
+. (Get-ChildItem -Path $RepoRoot -Filter "Test-CredentialStore.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "New-CredentialStore.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "Get-CredentialStore.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "Get-CredentialStoreItem.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "Test-ChallengeFile.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "Get-ChallengeFile.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "Set-ChallengeFile.ps1" -Recurse).FullName
+. (Get-ChildItem -Path $RepoRoot -Filter "Get-RandomKey.ps1" -Recurse).FullName
+
+#endregion HEADER
+
+Describe "New-CredentialStoreItem" {
+    Context "Private Credential Store tests" {
+        It "Test1: Add entry to existing private store." {
+            If (-not (Test-CredentialStore)) {
+                New-CredentialStore
+            }
+            [String]$tmp = (65..90) + (97..122) | Get-Random -Count 5 | % {[char]$_}
+            $tmp = $tmp.Replace(' ', '')
+            $tmpUser = "MyUser"
+            $tmpPwd = "fooobarysdfsfs" | ConvertTo-SecureString -AsPlainText -Force
+            $creds = New-Object -TypeName PsCredential -ArgumentList $tmpUser, $tmpPwd
+            New-CredentialStoreItem -RemoteHost $tmp -Credential $creds
+            # Had to remove the `{ <exp> } | Shoud Not Throw` because the return would be empty.
+            $content = Get-CredentialStoreItem -RemoteHost $tmp
+            $content.UserName | Should Be "MyUser"
+            #Cleanup Temp entry
+            $CS = Get-CredentialStore
+            $CS.PSObject.Properties.Remove($tmp)
+            ConvertTo-Json -InputObject $CS | Out-File -FilePath ("{0}\CredentialStore.json" -f $env:AppData)
+        }
+    }
+    Context "Test with new shared Credential Store" {
+        It "Test2: Create new RemoteHost entry" {
+            # prepare test environment
+            $tmpCS = 'C:\CredentialStore.json'
+            New-CredentialStore -Shared -Path $tmpCS
+
+            $UserName = "myuser"
+            $Password = ConvertTo-SecureString -String "mypasswd" -AsPlainText -Force
+            $mycreds = New-Object -TypeName PSCredential -ArgumentList $UserName, $Password
+            $RemoteHost = "foobar"
+            { New-CredentialStoreItem -Path $tmpCS -RemoteHost $RemoteHost -Credential $mycreds -Shared } | Should Not Throw
+            $tmpCS = Get-Content -Path $tmpCS -Raw | ConvertFrom-Json
+            $res = Get-Member -InputObject $tmpCS -Name $RemoteHost -Membertype Properties
+            $res.Name | Should Be $RemoteHost
+        }
+    }
+}