diff --git a/lib/index.js b/lib/index.js
new file mode 100644
index 0000000..300784b
--- /dev/null
+++ b/lib/index.js
@@ -0,0 +1,265 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.persistentReducer = exports.persistentStore = exports.inSync = undefined;
+
+var _save = require('./save.js');
+
+Object.defineProperty(exports, 'inSync', {
+  enumerable: true,
+  get: function get() {
+    return _save.inSync;
+  }
+});
+exports.reinit = reinit;
+
+var _uuid = require('uuid');
+
+var _uuid2 = _interopRequireDefault(_uuid);
+
+var _lodash = require('lodash.isequal');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
+var _lodash3 = require('lodash.clonedeep');
+
+var _lodash4 = _interopRequireDefault(_lodash3);
+
+var _save2 = _interopRequireDefault(_save);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// A client hash to filter out local database changes (as those
+// may lead to several race conditions).
+// see also http://stackoverflow.com/questions/28280276/changes-filter-only-changes-from-other-db-instances
+var CLIENT_HASH = _uuid2.default.v1();
+
+var REINIT = '@@redux-pouchdb-plus/REINIT';
+var INIT = '@@redux-pouchdb-plus/INIT';
+var SET_REDUCER = '@@redux-pouchdb-plus/SET_REDUCER';
+
+var allReducers = [];
+
+function reinit(reducerName) {
+  if (reducerName && allReducers.indexOf(reducerName) === -1) throw TypeError('Invalid persistent reducer to reinit: ' + reducerName);
+
+  return { type: REINIT, reducerName: reducerName };
+}
+
+var persistentStore = exports.persistentStore = function persistentStore() {
+  var storeOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return function (createStore) {
+    return function (reducer, initialState) {
+      var store = createStore(reducer, initialState);
+      var initializedReducers = {};
+
+      store.dispatch({
+        type: INIT,
+        store: store,
+        storeOptions: storeOptions,
+        initializedReducers: initializedReducers
+      });
+
+      return store;
+    };
+  };
+};
+
+var persistentReducer = exports.persistentReducer = function persistentReducer(reducer) {
+  var reducerOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var initialState = void 0;
+  var store = void 0;
+  var storeOptions = void 0;
+  var initializedReducers = {};
+  var changes = void 0;
+  var saveReducer = void 0;
+  var currentState = void 0;
+  var name = reducerOptions.name ? reducerOptions.name : reducer.name;
+
+  initializedReducers[name] = false;
+
+  // call the provide (store only) callback as soon
+  // as all persistent reducers are initialized
+  function onReady() {
+    if (storeOptions.onReady instanceof Function) storeOptions.onReady.call(null, store);
+  }
+
+  // call the provided callbacks as soon as this reducer
+  // was initialized (loaded from or saved to the db)
+  function onInit(state) {
+    if (reducerOptions.onInit instanceof Function) reducerOptions.onInit.call(null, name, state, store);
+    if (storeOptions.onInit instanceof Function) storeOptions.onInit.call(null, name, state, store);
+  }
+
+  // call the provided callbacks when this reducer
+  // was updated with data from the db
+  function onUpdate(state) {
+    if (reducerOptions.onUpdate instanceof Function) reducerOptions.onUpdate.call(null, name, state, store);
+    if (storeOptions.onUpdate instanceof Function) storeOptions.onUpdate.call(null, name, state, store);
+  }
+
+  // call the provided callbacks when the state
+  // of this reducer was saved to the db
+  function onSave(state) {
+    if (reducerOptions.onSave instanceof Function) reducerOptions.onSave.call(null, name, state, store);
+    if (storeOptions.onSave instanceof Function) storeOptions.onSave.call(null, name, state, store);
+  }
+
+  // get the current db connector an initialize the state of this
+  // reducer by loading it from the db or by saving it
+  // to the db (if it is not already persisted there)
+  function reinitReducer(state) {
+    if (changes) changes.cancel();
+
+    var db = reducerOptions.db || storeOptions.db;
+    if (!db) throw TypeError('No db connector provided. ' + 'You must at least provide one to the store or the reducer.');
+
+    if (db instanceof Function) db = db(name, store);
+
+    saveReducer = (0, _save2.default)(db, CLIENT_HASH);
+
+    db.get(name).then(function (doc) {
+      // set reducer state if there was an entry found in the db
+      setReducer(doc);
+    }).catch(function (err) {
+      // save the reducer state if there was no entry in the db
+      if (err.status === 404) return saveReducer(name, toPouch(state)).then(function () {
+        onSave(state);
+      });else throw err;
+    }).then(function () {
+      // from here on the reducer was loaded from db or saved to db
+      initializedReducers[name] = true;
+      onInit(currentState);
+
+      var ready = true;
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
+
+      try {
+        for (var _iterator = Object.keys(initializedReducers)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var reducerName = _step.value;
+
+          if (!initializedReducers[reducerName]) {
+            ready = false;
+            break;
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
+
+      if (ready) onReady();
+
+      // listen to changes in the db (e.g. when a replication occurs)
+      // and update the reducer state when it happens
+      return changes = db.changes({
+        include_docs: true,
+        live: true,
+        since: 'now',
+        doc_ids: [name]
+      }).on('change', function (change) {
+        if (change.doc.localId !== CLIENT_HASH) {
+          if (!change.doc.state) saveReducer(change.doc._id, toPouch(currentState)).then(function () {
+            onSave(currentState);
+          });else if (!isEqual(fromPouch(change.doc.state), currentState)) setReducer(change.doc);
+        }
+      });
+    });
+  }
+
+  // an action to update the current reducer state (used when
+  // the state was fetched from the db)
+  function setReducer(doc) {
+    var _id = doc._id,
+        _rev = doc._rev,
+        state = doc.state;
+
+    var _state = fromPouch(state);
+
+    store.dispatch({
+      type: SET_REDUCER,
+      reducer: _id,
+      state: _state,
+      _rev: _rev
+    });
+  }
+
+  function toPouch(x) {
+    if (reducerOptions.toPouch instanceof Function) return reducerOptions.toPouch.call(null, x);else return (0, _lodash4.default)(x);
+  }
+  function fromPouch(x) {
+    if (reducerOptions.fromPouch instanceof Function) return reducerOptions.fromPouch.call(null, x);else return (0, _lodash4.default)(x);
+  }
+  function isEqual(x, y) {
+    if (reducerOptions.isEqual instanceof Function) return reducerOptions.isEqual.call(null, x, y);else return (0, _lodash2.default)(x, y);
+  }
+
+  // the proxy function that wraps the real reducer
+  var proxyReducer = function proxyReducer(state, action) {
+    switch (action.type) {
+      case INIT:
+        store = action.store;
+        storeOptions = action.storeOptions;
+        initializedReducers = action.initializedReducers;
+        if (initializedReducers.hasOwnProperty(name)) throw Error('Duplicate reducer of name ' + name + ' in the same store');
+        initializedReducers[name] = false;
+        allReducers.push(name);
+      // falls through
+
+      case REINIT:
+        if (!action.reducerName || action.reducerName === name) {
+          initializedReducers[name] = false;
+          reinitReducer(initialState);
+          return currentState = initialState;
+        } else return state;
+
+      case SET_REDUCER:
+        if (action.reducer === name && action.state) {
+          currentState = reducer(action.state, action);
+          onUpdate(currentState);
+          return currentState;
+        }
+      // falls through
+
+      default:
+        {
+          var nextState = reducer(state, action);
+
+          if (!initialState) {
+            initialState = nextState;
+          }
+
+          var isInitialized = initializedReducers[name];
+          if (isInitialized && !isEqual(nextState, currentState)) {
+            currentState = nextState;
+            saveReducer(name, toPouch(currentState)).then(function () {
+              onSave(currentState);
+            });
+          } else currentState = nextState;
+
+          return currentState;
+        }
+    }
+  };
+
+  proxyReducer.getName = function () {
+    return name;
+  };
+
+  return proxyReducer;
+};
\ No newline at end of file
diff --git a/lib/save.js b/lib/save.js
new file mode 100644
index 0000000..9cbb5e0
--- /dev/null
+++ b/lib/save.js
@@ -0,0 +1,80 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.inSync = inSync;
+var unpersistedQueue = {};
+var isSaving = {};
+
+// checks if there is some state saving in progress
+function inSync() {
+  var reducerNames = Object.keys(isSaving);
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = reducerNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var n = _step.value;
+
+      if (isSaving[n]) return false;
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  return true;
+}
+
+exports.default = function (db, localId) {
+  var saveReducer = function saveReducer(reducerName, reducerState) {
+    if (isSaving[reducerName]) {
+      // enqueue promise
+      unpersistedQueue[reducerName] = unpersistedQueue[reducerName] || [];
+      unpersistedQueue[reducerName].push(reducerState);
+
+      return Promise.resolve();
+    }
+
+    isSaving[reducerName] = true;
+
+    return db.get(reducerName).catch(function (err) {
+      if (err.status === 404) {
+        return { _id: reducerName };
+      } else {
+        throw err;
+      }
+    }).catch(function (err) {
+      console.error(err);
+    }).then(function (doc) {
+      doc.localId = localId;
+      doc.state = reducerState;
+      return doc;
+    }).then(function (doc) {
+      return db.put(doc);
+    }).then(function () {
+      delete isSaving[reducerName];
+
+      if (unpersistedQueue[reducerName] && unpersistedQueue[reducerName].length > 0) {
+        var next = unpersistedQueue[reducerName].shift();
+        return saveReducer(reducerName, next);
+      }
+    }).catch(function (err) {
+      console.error(err);
+    });
+  };
+
+  return saveReducer;
+};
\ No newline at end of file
diff --git a/package.json b/package.json
index 91fe68a..97bcfe5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-pouchdb-plus",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "description": "Synchronize Redux store with PouchDB to have a persistent store.",
   "main": "lib/index.js",
   "scripts": {
@@ -49,7 +49,7 @@
   "dependencies": {
     "lodash.clonedeep": "^4.1.0",
     "lodash.isequal": "^4.0.0",
-    "pouchdb": "^6.2.0",
+    "pouchdb": "^7.2.0",
     "uuid": "^3.0.0"
   }
 }