diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj
index a8fdccc..3726643 100644
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@@ -102,6 +102,9 @@
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="README.md" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/CredWrite/CredWrite.vcxproj.filters b/CredWrite/CredWrite.vcxproj.filters
index 3b68d98..21c5de5 100644
--- a/CredWrite/CredWrite.vcxproj.filters
+++ b/CredWrite/CredWrite.vcxproj.filters
@@ -32,4 +32,7 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="README.md" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
index 3373983..81ecb02 100644
Binary files a/CredWrite/Main.cpp and b/CredWrite/Main.cpp differ
diff --git a/CredWrite/README.md b/CredWrite/README.md
index c955577..6f68729 100644
--- a/CredWrite/README.md
+++ b/CredWrite/README.md
@@ -6,7 +6,7 @@ Imports given credentials to Windows Credential Manager for GEANTLink use
 CredWrite <username> <password> [<realm>]
 ```
 
-- `username` - a user name usually of the form user@domain
+- `username` - Base64 encoded UTF-8 user name (usually of the form user@domain or domain\user)
 - `password` - Base64 encoded UTF-8 user password
 - `realm`    - A realm ID to allow grouping of credentials over different WLAN profiles (optional, default is domain part of `username`)
 
diff --git a/lib/WinStd b/lib/WinStd
index 46b77c7..5f74fc0 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 46b77c7f691b602961ff77951abcdea52ecce175
+Subproject commit 5f74fc0ff79a034814b5c285b2f69c9b8a3c137f