@@ -289,10 +289,12 @@ function createActionDispatcher(routesConfig, window) {

       this.store = store;

     },

     enhanceStore(nextStoreCreator) {

+      let middleware = buildMiddleware(this);

       return (reducer, finalInitialState, enhancer) => {

         let theStore = nextStoreCreator(reducer, finalInitialState, enhancer);

         this.activateDispatcher(theStore);

         theStore.pathForAction = pathForAction;

+        theStore.dispatch = middleware(theStore)(theStore.dispatch.bind(theStore));

         return theStore;

       };

     },

@@ -307,10 +309,14 @@ function createActionDispatcher(routesConfig, window) {

     },

     onLocationChanged(newLoc, cb) {

+      let result = undefined;

+

       if (this.currentLocation !== newLoc) {

         this.currentLocation = newLoc;

-        return cb();

+        result = cb();

       }

+

+      return result;

     },

     receiveLocation(location) {

@@ -357,7 +363,13 @@ export default function installBrowserRouter(routesConfig, window) {

   const actionDispatcher = createActionDispatcher(routesConfig, window);

-  const middleware = buildMiddleware(actionDispatcher);

+  const middleware = x => {

+    console.warn(

+      'Using the routedux middleware directly is deprecated, the enhancer now applies it automatically'

+      + ' and the middleware is now a no-op that will be removed in later versions.'

+    );

+    return y => y;

+  };

   return {middleware, enhancer: actionDispatcher.enhanceStore, init: actionDispatcher.receiveLocation.bind(actionDispatcher, window.location)};

 }

@@ -83,15 +83,12 @@ function setupTest(routesConfig, path='/path/to/thing') {

   addMissingHistoryEvents(window, window.history);

   addChangeUrlEvent(window, window.history);

-  const {middleware, enhancer, init} = installBrowserRouter(routesConfig, window);

+  const {enhancer, init} = installBrowserRouter(routesConfig, window);

   const reduce = jest.fn();

   const store = createStore(

     reduce,

-    compose(

-      enhancer,

-      applyMiddleware(

-        middleware)));

+    enhancer);

   function urlChanges() {

     return mockPushState.mock.calls.map(item => item[2]);