diff --git a/bin/web/login.html b/bin/web/login.html
index a6687cf7..172a23f3 100644
--- a/bin/web/login.html
+++ b/bin/web/login.html
@@ -43,6 +43,14 @@
 				return data;
 			}
 
+			function keypressing(e) {
+				if (!e) e = window.event;
+				var keyCode = e.keyCode || e.which;
+				if (keyCode == '13'){
+				  doLogin();
+				  return false;
+				}
+			}
 			
 			
 		</script>
@@ -79,7 +87,7 @@
 				<div class="input-control">
 					<label class="s-login-input-wrapper">
 						Password
-						<input type="password" name="password">
+						<input type="password" name="password" onkeypress="return keypressing(event)">
 					</label>
 				</div>
 				<button class="btn btn-default s-login-btn pull-right" id="submitButton" onclick="doLogin()">Login</button>
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index c413d73b..99bd6428 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -9,6 +9,14 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+  
+  if (MSVC_VERSION GREATER_EQUAL "1900")
+    include(CheckCXXCompilerFlag)
+    CHECK_CXX_COMPILER_FLAG("/std:c++latest" _cpp_latest_flag_supported)
+    if (_cpp_latest_flag_supported)
+        add_compile_options("/std:c++latest")
+    endif()
+  endif()
 
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     # disabling SAFESEH