diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 1758c2e..6c63040 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -10,6 +10,7 @@ options = {
     onInterpolation: function(currentState, previousState, targetState, amount)
     logging: true,
     clientSidePrediction: true,
+    clientSmoothing: true,
     interpolation: true,
     pingInterval: 2000
 }
@@ -176,7 +177,7 @@ window.GarageServerIO = (function (window, socketio) {
             });
             _socket.on('ping', function(data) {
                 var newPingDelay = new Date().getTime() - data;
-                _stateController.clientSmoothing = _stateController.pingDelay / newPingDelay;
+                _stateController.clientSmoothing = _options.clientSmoothing ? (_stateController.pingDelay / newPingDelay) : 1;
                 _stateController.pingDelay = newPingDelay;
                 if (_options.onPing) {
                     _options.onPing(_stateController.pingDelay);
diff --git a/example/public/javascripts/game.js b/example/public/javascripts/game.js
index 684ec4c..c7e8328 100644
--- a/example/public/javascripts/game.js
+++ b/example/public/javascripts/game.js
@@ -2,6 +2,7 @@ $(function () {
     GarageServerIO.connectToGarageServer('http://garageserver_io.jbillmann.c9.io', { 
         logging: true,
         clientSidePrediction: true,
+        clientSmoothing: true,
         interpolation: true,
         onUpdatePlayerPhysics: OnProcessGamePhysics,
         onInterpolation: function (currentState, previousState, targetState, amount) {