diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index bd82de8..6524ad8 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,6 +1,7 @@
 # Cake.Docker 0.8.3
 
 * Added DockerLogout
+* Refactors arguments handling to support hiding password values
 
 # Cake.Docker 0.8.2
 
diff --git a/src/Cake.Docker.sln b/src/Cake.Docker.sln
index 684e0ee..10b6b55 100644
--- a/src/Cake.Docker.sln
+++ b/src/Cake.Docker.sln
@@ -1,11 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2008
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73141119-9964-4C31-9406-A24AAF6AB92F}"
 	ProjectSection(SolutionItems) = preProject
 		build.cake = build.cake
+		build.ps1 = build.ps1
 		Cake.Docker.nuspec = Cake.Docker.nuspec
 		..\README.md = ..\README.md
 		..\ReleaseNotes.md = ..\ReleaseNotes.md
@@ -13,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Docker", "Cake.Docker\Cake.Docker.csproj", "{4208625D-10EE-425E-9DC0-B79E0ED79C13}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Docker.Tests", "Cake.Docker.Tests\Cake.Docker.Tests.csproj", "{E3A99266-E151-4D85-9D87-AB69C92A85D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Docker.Tests", "Cake.Docker.Tests\Cake.Docker.Tests.csproj", "{E3A99266-E151-4D85-9D87-AB69C92A85D2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Cake.Docker/ArgumentsBuilderExtension.cs b/src/Cake.Docker/ArgumentsBuilderExtension.cs
index a4a70ce..8a14269 100644
--- a/src/Cake.Docker/ArgumentsBuilderExtension.cs
+++ b/src/Cake.Docker/ArgumentsBuilderExtension.cs
@@ -99,6 +99,7 @@ where a.HasValue
         /// <param name="property"></param>
         /// <param name="settings">The settings.</param>
         /// <param name="preCommand">Pre or post command.</param>
+        /// <param name="isSecret"></param>
         /// <returns></returns>
         public static IEnumerable<DockerArgument?> GetArgumentFromProperty<TSettings>(PropertyInfo property, TSettings settings, bool preCommand, bool isSecret)
             where TSettings : AutoToolSettings, new()
@@ -154,6 +155,13 @@ where a.HasValue
                 }
             }
         }
+        /// <summary>
+        /// Checks out whether given <paramref name="property"/> is a secret.
+        /// </summary>
+        /// <typeparam name="TSettings"></typeparam>
+        /// <param name="property"></param>
+        /// <param name="settings"></param>
+        /// <returns></returns>
         public  static bool IsPropertyValueSecret<TSettings>(PropertyInfo property, TSettings settings)
             where TSettings : AutoToolSettings
         {
@@ -270,6 +278,7 @@ public static string GetArgumentFromNullableBoolProperty(PropertyInfo property,
         /// </summary>
         /// <param name="property"></param>
         /// <param name="values"></param>
+        /// <param name="isSecret"></param>
         /// <returns></returns>
         public static IEnumerable<DockerArgument?> GetArgumentFromDictionaryProperty(PropertyInfo property, Dictionary<string, string> values, bool isSecret)
         {
@@ -287,6 +296,7 @@ public static string GetArgumentFromNullableBoolProperty(PropertyInfo property,
         /// </summary>
         /// <param name="property"></param>
         /// <param name="values"></param>
+        /// <param name="isSecret"></param>
         /// <returns></returns>
         public static IEnumerable<DockerArgument?> GetArgumentFromStringArrayProperty(PropertyInfo property, string[] values, bool isSecret)
         {
@@ -304,6 +314,7 @@ public static string GetArgumentFromNullableBoolProperty(PropertyInfo property,
         /// </summary>
         /// <param name="property"></param>
         /// <param name="value"></param>
+        /// <param name="isSecret"></param>
         /// <returns></returns>
         public static DockerArgument? GetArgumentFromStringProperty(PropertyInfo property, string value, bool isSecret)
         {
diff --git a/src/Cake.Docker/Cake.Docker.csproj b/src/Cake.Docker/Cake.Docker.csproj
index 27f6581..b647cc7 100644
--- a/src/Cake.Docker/Cake.Docker.csproj
+++ b/src/Cake.Docker/Cake.Docker.csproj
@@ -22,7 +22,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <PackageReleaseNotes>See https://github.com/MihaMarkic/Cake.Docker/blob/master/ReleaseNotes.md</PackageReleaseNotes>
-    <Version>0.8.2</Version>
+    <Version>0.8.3</Version>
 	 <PackageIconUrl>https://raw.githubusercontent.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</PackageIconUrl>
   </PropertyGroup>
 
diff --git a/src/build.ps1 b/src/build.ps1
index 9c61f56..9adcd07 100644
--- a/src/build.ps1
+++ b/src/build.ps1
@@ -31,6 +31,7 @@ http://cakebuild.net
 [CmdletBinding()]
 Param(
     [string]$Script = "build.cake",
+	[ValidateSet("UnitTest", "NuGetPack", "Default")]
     [string]$Target = "Default",
     [string]$Configuration = "Release",
     [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]