diff --git a/.gitignore b/.gitignore
index 736cb90f..ab6dec6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+bin
+.vs
 *.dat
 *.suo
 *.pch
diff --git a/src/servers/Server_Common/UtilMath.h b/src/servers/Server_Common/UtilMath.h
index f864e24a..68feeabe 100644
--- a/src/servers/Server_Common/UtilMath.h
+++ b/src/servers/Server_Common/UtilMath.h
@@ -29,9 +29,17 @@ template
 <typename T>
 T clamp( T val, T minimum, T maximum )
 {
-     // TODO: Lazy hack, do this properly...
-     return maximum;
-//   return std::max( std::min( val, maximum ), minimum );
+   if (val > maximum)
+   {
+      return maximum;
+   }
+   
+   if (val < minimum)
+   {
+      return minimum;
+   }
+
+   return val;
 }
 }
 }