Merge remote-tracking branch 'origin/master' into withConsoleLog

src/hybridSimulation.js

@@ -63,6 +63,10 @@ export default function (sim, forceS, forceF) {
       forceSample.onStableVelo(sampleEnded);
     }
 
+    if (forceFull.onStableVelo) {
+      forceFull.onStableVelo(fullEnded);
+    }
+
     // Set default value for interpDistanceFn if not been specified yet
     if(interpDistanceFn === undefined) {
       if(forceFull.distance == 'function')
@@ -96,6 +100,11 @@ export default function (sim, forceS, forceF) {
   function fullTick() {
     event.call("fullTick");
     if(++alreadyRanIterations >= FULL_ITERATIONS){
+      fullEnded();
+    }
+  }
+
+  function fullEnded() {
       simulation.stop();
       initAlready = false;
       simulation.force("Full force", null);