diff --git a/dist/redux-oidc.js b/dist/redux-oidc.js
index cc0de1d..5cd3f18 100644
--- a/dist/redux-oidc.js
+++ b/dist/redux-oidc.js
@@ -1 +1 @@
-!function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r(require("react"),require("co"),require("immutable"),require("oidc-client"));else if("function"==typeof define&&define.amd)define(["react","co","immutable","oidc-client"],r);else{var t="object"==typeof exports?r(require("react"),require("co"),require("immutable"),require("oidc-client")):r(e.react,e.co,e.immutable,e["oidc-client"]);for(var n in t)("object"==typeof exports?exports:e)[n]=t[n]}}(this,function(e,r,t,n){return function(e){function r(n){if(t[n])return t[n].exports;var o=t[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,r),o.loaded=!0,o.exports}var t={};return r.m=e,r.c=t,r.p="",r(0)}([function(e,r,t){e.exports=t(8)},function(e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.USER_EXPIRED="redux-oidc/USER_EXPIRED",r.REDIRECT_SUCCESS="redux-oidc/REDIRECT_SUCCESS",r.USER_LOADED="redux-oidc/USER_LOADED",r.SILENT_RENEW_ERROR="redux-oidc/SILENT_RENEW_ERROR",r.SESSION_TERMINATED="redux-oidc/SESSION_TERMINATED",r.USER_EXPIRING="redux-oidc/USER_EXPIRING",r.USER_FOUND="redux-oidc/USER_FOUND",r.LOADING_USER="redux-oidc/LOADING_USER",r.USER_SIGNED_OUT="redux-oidc/USER_SIGNED_OUT"},function(e,r,t){"use strict";function n(){return{type:l.USER_EXPIRED}}function o(e){return{type:l.REDIRECT_SUCCESS,payload:e}}function i(e){return{type:l.USER_FOUND,payload:e}}function s(e){return{type:l.SILENT_RENEW_ERROR,payload:e}}function u(){return{type:l.SESSION_TERMINATED}}function a(){return{type:l.USER_EXPIRING}}function c(){return{type:l.LOADING_USER}}function d(){return{type:l.USER_SIGNED_OUT}}Object.defineProperty(r,"__esModule",{value:!0}),r.userExpired=n,r.redirectSuccess=o,r.userFound=i,r.silentRenewError=s,r.sessionTerminated=u,r.userExpiring=a,r.loadingUser=c,r.userSignedOut=d;var l=t(1)},function(e,r,t){"use strict";function n(e){return new o.UserManager(e)}Object.defineProperty(r,"__esModule",{value:!0}),r.default=n;var o=t(14)},function(e,r){e.exports=require("react")},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var t=0;t<r.length;t++){var n=r[t];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(r,t,n){return t&&e(r.prototype,t),n&&e(r,n),r}}(),a=t(4),c=n(a),d=(t(2),function(e){function r(){var e,t,n,s;o(this,r);for(var u=arguments.length,a=Array(u),c=0;c<u;c++)a[c]=arguments[c];return t=n=i(this,(e=r.__proto__||Object.getPrototypeOf(r)).call.apply(e,[this].concat(a))),n.onRedirectSuccess=function(e){n.props.successCallback(e)},n.onRedirectError=function(e){if(!n.props.errorCallback)throw new Error("Error handling redirect callback: "+e.message);n.props.errorCallback(e)},s=t,i(n,s)}return s(r,e),u(r,[{key:"componentDidMount",value:function(){var e=this;this.props.userManager.signinRedirectCallback(this.props.route).then(function(r){return e.onRedirectSuccess(r)}).catch(function(r){return e.onRedirectError(r)})}},{key:"render",value:function(){return c.default.createElement("div",null,this.props.children||this.defaultContent)}},{key:"defaultContent",get:function(){return c.default.createElement("div",null,"Redirecting...")}}]),r}(c.default.Component));d.propTypes={userManager:a.PropTypes.object.isRequired,successCallback:a.PropTypes.func.isRequired,errorCallback:a.PropTypes.func,route:a.PropTypes.string},r.default=d},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var t=0;t<r.length;t++){var n=r[t];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(r,t,n){return t&&e(r.prototype,t),n&&e(r,n),r}}(),a=t(4),c=n(a),d=t(2),l=function(e){function r(e){o(this,r);var t=i(this,(r.__proto__||Object.getPrototypeOf(r)).call(this,e));return t.onUserLoaded=function(e){t.props.store.dispatch((0,d.userFound)(e))},t.onSilentRenewError=function(e){t.props.store.dispatch((0,d.silentRenewError)(e))},t.onAccessTokenExpired=function(){t.props.store.dispatch((0,d.userExpired)())},t.onUserUnloaded=function(){t.props.store.dispatch((0,d.sessionTerminated)())},t.onAccessTokenExpiring=function(){t.props.store.dispatch((0,d.userExpiring)())},t.onUserSignedOut=function(){t.props.store.dispatch((0,d.userSignedOut)())},t.userManager=e.userManager,t}return s(r,e),u(r,[{key:"componentWillMount",value:function(){this.userManager.events.addUserLoaded(this.onUserLoaded),this.userManager.events.addSilentRenewError(this.onSilentRenewError),this.userManager.events.addAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.addAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.addUserUnloaded(this.onUserUnloaded),this.userManager.events.addUserSignedOut(this.onUserSignedOut)}},{key:"componentWillUnmount",value:function(){this.userManager.events.removeUserLoaded(this.onUserLoaded),this.userManager.events.removeSilentRenewError(this.onSilentRenewError),this.userManager.events.removeAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.removeAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.removeUserUnloaded(this.onUserUnloaded),this.userManager.events.removeUserSignedOut(this.onUserSignedOut)}},{key:"render",value:function(){return c.default.Children.only(this.props.children)}}]),r}(c.default.Component);l.propTypes={userManager:a.PropTypes.object.isRequired,store:a.PropTypes.object.isRequired},r.default=l},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(){var e=(0,s.default)();e.signinSilentCallback()}Object.defineProperty(r,"__esModule",{value:!0}),r.default=o;var i=t(3),s=n(i)},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(r,"__esModule",{value:!0}),r.userSignedOut=r.loadingUser=r.userExpiring=r.sessionTerminated=r.silentRenewError=r.userFound=r.redirectSuccess=r.userExpired=r.USER_SIGNED_OUT=r.LOADING_USER=r.USER_EXPIRING=r.SESSION_TERMINATED=r.SILENT_RENEW_ERROR=r.USER_NOT_FOUND=r.USER_FOUND=r.REDIRECT_SUCCESS=r.USER_EXPIRED=r.OidcProvider=r.reducer=r.immutableReducer=r.CallbackComponent=r.processSilentRenew=r.createUserManager=void 0;var o=t(9),i=n(o);r.createUserManager=t(3).default,r.processSilentRenew=t(7).default,r.CallbackComponent=t(5).default,r.immutableReducer=t(10).default,r.reducer=t(11).default,r.OidcProvider=t(6).default,r.USER_EXPIRED=t(1).USER_EXPIRED,r.REDIRECT_SUCCESS=t(1).REDIRECT_SUCCESS,r.USER_FOUND=t(1).USER_FOUND,r.USER_NOT_FOUND=t(1).USER_NOT_FOUND,r.SILENT_RENEW_ERROR=t(1).SILENT_RENEW_ERROR,r.SESSION_TERMINATED=t(1).SESSION_TERMINATED,r.USER_EXPIRING=t(1).USER_EXPIRING,r.LOADING_USER=t(1).LOADING_USER,r.USER_SIGNED_OUT=t(1).USER_SIGNED_OUT,r.userExpired=t(2).userExpired,r.redirectSuccess=t(2).redirectSuccess,r.userFound=t(2).userFound,r.silentRenewError=t(2).silentRenewError,r.sessionTerminated=t(2).sessionTerminated,r.userExpiring=t(2).userExpiring,r.loadingUser=t(2).loadingUser,r.userSignedOut=t(2).userSignedOut,r.default=i.default},function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e){r.storedUser=f=e}function i(){r.storedUser=f=null}function s(e){console.error("Error in oidcMiddleware",e)}function u(e,t,n){var o;return regeneratorRuntime.wrap(function(i){for(;;)switch(i.prev=i.next){case 0:if(f&&!f.expired){i.next=6;break}return e((0,c.loadingUser)()),i.next=4,n.getUser();case 4:o=i.sent,!o||o.expired?e((0,c.userExpired)()):(r.storedUser=f=o,e((0,c.userFound)(o)));case 6:return i.abrupt("return",e(t));case 7:case"end":return i.stop()}},E[0],this)}function a(e){if(!e||!e.getUser)throw new Error("You must provide a user manager!");return function(r){return function(r){return function(t){(0,l.default)(u(r,t,e)).catch(s)}}}}Object.defineProperty(r,"__esModule",{value:!0}),r.storedUser=void 0,r.setStoredUser=o,r.removeStoredUser=i,r.errorCallback=s,r.middlewareHandler=u,r.default=a;var c=t(2),d=t(12),l=n(d),E=[u].map(regeneratorRuntime.mark),f=r.storedUser=null},function(e,r,t){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var n=t(1),o=void 0;try{!function(){var e=t(13).fromJS,r=e({user:null,isLoadingUser:!1});o=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:r,o=arguments[1];switch(o.type){case n.USER_EXPIRED:return t.set("isLoadingUser",!1);case n.SILENT_RENEW_ERROR:return t.set("isLoadingUser",!1);case n.SESSION_TERMINATED:case n.USER_SIGNED_OUT:return e({user:null,isLoadingUser:!1});case n.REDIRECT_SUCCESS:case n.USER_FOUND:return e({user:o.payload,isLoadingUser:!1});case n.LOADING_USER:return t.set("isLoadingUser",!0);default:return t}}}()}catch(e){o=function(){console.error("You must install immutable-js for this to work!")}}r.default=o},function(e,r,t){"use strict";function n(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:s,r=arguments[1];switch(r.type){case i.USER_EXPIRED:return Object.assign({},o({},e),{user:null,isLoadingUser:!1});case i.SILENT_RENEW_ERROR:return Object.assign({},o({},e),{isLoadingUser:!1});case i.SESSION_TERMINATED:case i.USER_SIGNED_OUT:return Object.assign({},o({},e),{user:null,isLoadingUser:!1});case i.REDIRECT_SUCCESS:case i.USER_FOUND:return Object.assign({},o({},e),{user:r.payload,isLoadingUser:!1});case i.LOADING_USER:return Object.assign({},o({},e),{isLoadingUser:!0});default:return e}}Object.defineProperty(r,"__esModule",{value:!0});var o=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var t=arguments[r];for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])}return e};r.default=n;var i=t(1),s={user:null,isLoadingUser:!1}},function(e,r){e.exports=require("co")},function(e,r){e.exports=require("immutable")},function(e,r){e.exports=require("oidc-client")}])});
\ No newline at end of file
+!function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r(require("react"),require("co"),require("immutable"),require("oidc-client"));else if("function"==typeof define&&define.amd)define(["react","co","immutable","oidc-client"],r);else{var n="object"==typeof exports?r(require("react"),require("co"),require("immutable"),require("oidc-client")):r(e.react,e.co,e.immutable,e["oidc-client"]);for(var t in n)("object"==typeof exports?exports:e)[t]=n[t]}}(this,function(e,r,n,t){return function(e){function r(t){if(n[t])return n[t].exports;var o=n[t]={i:t,l:!1,exports:{}};return e[t].call(o.exports,o,o.exports,r),o.l=!0,o.exports}var n={};return r.m=e,r.c=n,r.i=function(e){return e},r.d=function(e,n,t){r.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},r.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(n,"a",n),n},r.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r.p="",r(r.s=14)}([function(e,r,n){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.USER_EXPIRED="redux-oidc/USER_EXPIRED",r.REDIRECT_SUCCESS="redux-oidc/REDIRECT_SUCCESS",r.USER_LOADED="redux-oidc/USER_LOADED",r.SILENT_RENEW_ERROR="redux-oidc/SILENT_RENEW_ERROR",r.SESSION_TERMINATED="redux-oidc/SESSION_TERMINATED",r.USER_EXPIRING="redux-oidc/USER_EXPIRING",r.USER_FOUND="redux-oidc/USER_FOUND",r.LOADING_USER="redux-oidc/LOADING_USER",r.USER_SIGNED_OUT="redux-oidc/USER_SIGNED_OUT"},function(e,r,n){"use strict";function t(){return{type:l.USER_EXPIRED}}function o(e){return{type:l.REDIRECT_SUCCESS,payload:e}}function i(e){return{type:l.USER_FOUND,payload:e}}function s(e){return{type:l.SILENT_RENEW_ERROR,payload:e}}function u(){return{type:l.SESSION_TERMINATED}}function c(){return{type:l.USER_EXPIRING}}function a(){return{type:l.LOADING_USER}}function d(){return{type:l.USER_SIGNED_OUT}}Object.defineProperty(r,"__esModule",{value:!0}),r.userExpired=t,r.redirectSuccess=o,r.userFound=i,r.silentRenewError=s,r.sessionTerminated=u,r.userExpiring=c,r.loadingUser=a,r.userSignedOut=d;var l=n(0)},function(e,r,n){"use strict";function t(e){return new o.UserManager(e)}Object.defineProperty(r,"__esModule",{value:!0}),r.default=t;var o=n(13)},function(e,r){e.exports=require("react")},function(e,r,n){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(r,"__esModule",{value:!0}),r.userSignedOut=r.loadingUser=r.userExpiring=r.sessionTerminated=r.silentRenewError=r.userFound=r.redirectSuccess=r.userExpired=r.USER_SIGNED_OUT=r.LOADING_USER=r.USER_EXPIRING=r.SESSION_TERMINATED=r.SILENT_RENEW_ERROR=r.USER_NOT_FOUND=r.USER_FOUND=r.REDIRECT_SUCCESS=r.USER_EXPIRED=r.OidcProvider=r.reducer=r.immutableReducer=r.CallbackComponent=r.processSilentRenew=r.createUserManager=void 0;var o=n(8),i=t(o);r.createUserManager=n(2).default,r.processSilentRenew=n(7).default,r.CallbackComponent=n(5).default,r.immutableReducer=n(9).default,r.reducer=n(10).default,r.OidcProvider=n(6).default,r.USER_EXPIRED=n(0).USER_EXPIRED,r.REDIRECT_SUCCESS=n(0).REDIRECT_SUCCESS,r.USER_FOUND=n(0).USER_FOUND,r.USER_NOT_FOUND=n(0).USER_NOT_FOUND,r.SILENT_RENEW_ERROR=n(0).SILENT_RENEW_ERROR,r.SESSION_TERMINATED=n(0).SESSION_TERMINATED,r.USER_EXPIRING=n(0).USER_EXPIRING,r.LOADING_USER=n(0).LOADING_USER,r.USER_SIGNED_OUT=n(0).USER_SIGNED_OUT,r.userExpired=n(1).userExpired,r.redirectSuccess=n(1).redirectSuccess,r.userFound=n(1).userFound,r.silentRenewError=n(1).silentRenewError,r.sessionTerminated=n(1).sessionTerminated,r.userExpiring=n(1).userExpiring,r.loadingUser=n(1).loadingUser,r.userSignedOut=n(1).userSignedOut,r.default=i.default},function(e,r,n){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),c=n(3),a=t(c),d=(n(1),function(e){function r(){var e,n,t,s;o(this,r);for(var u=arguments.length,c=Array(u),a=0;a<u;a++)c[a]=arguments[a];return n=t=i(this,(e=r.__proto__||Object.getPrototypeOf(r)).call.apply(e,[this].concat(c))),t.onRedirectSuccess=function(e){t.props.successCallback(e)},t.onRedirectError=function(e){if(!t.props.errorCallback)throw new Error("Error handling redirect callback: "+e.message);t.props.errorCallback(e)},s=n,i(t,s)}return s(r,e),u(r,[{key:"componentDidMount",value:function(){var e=this;this.props.userManager.signinRedirectCallback().then(function(r){return e.onRedirectSuccess(r)}).catch(function(r){return e.onRedirectError(r)})}},{key:"render",value:function(){return a.default.Children.only(this.props.children)}}]),r}(a.default.Component));d.propTypes={children:c.PropTypes.element.isRequired,userManager:c.PropTypes.object.isRequired,successCallback:c.PropTypes.func.isRequired,errorCallback:c.PropTypes.func},r.default=d},function(e,r,n){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}function o(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function i(e,r){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!r||"object"!=typeof r&&"function"!=typeof r?e:r}function s(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function, not "+typeof r);e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),r&&(Object.setPrototypeOf?Object.setPrototypeOf(e,r):e.__proto__=r)}Object.defineProperty(r,"__esModule",{value:!0});var u=function(){function e(e,r){for(var n=0;n<r.length;n++){var t=r[n];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(e,t.key,t)}}return function(r,n,t){return n&&e(r.prototype,n),t&&e(r,t),r}}(),c=n(3),a=t(c),d=n(1),l=function(e){function r(e){o(this,r);var n=i(this,(r.__proto__||Object.getPrototypeOf(r)).call(this,e));return n.onUserLoaded=function(e){n.props.store.dispatch((0,d.userFound)(e))},n.onSilentRenewError=function(e){n.props.store.dispatch((0,d.silentRenewError)(e))},n.onAccessTokenExpired=function(){n.props.store.dispatch((0,d.userExpired)())},n.onUserUnloaded=function(){n.props.store.dispatch((0,d.sessionTerminated)())},n.onAccessTokenExpiring=function(){n.props.store.dispatch((0,d.userExpiring)())},n.onUserSignedOut=function(){n.props.store.dispatch((0,d.userSignedOut)())},n.userManager=e.userManager,n}return s(r,e),u(r,[{key:"componentWillMount",value:function(){this.userManager.events.addUserLoaded(this.onUserLoaded),this.userManager.events.addSilentRenewError(this.onSilentRenewError),this.userManager.events.addAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.addAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.addUserUnloaded(this.onUserUnloaded),this.userManager.events.addUserSignedOut(this.onUserSignedOut)}},{key:"componentWillUnmount",value:function(){this.userManager.events.removeUserLoaded(this.onUserLoaded),this.userManager.events.removeSilentRenewError(this.onSilentRenewError),this.userManager.events.removeAccessTokenExpired(this.onAccessTokenExpired),this.userManager.events.removeAccessTokenExpiring(this.onAccessTokenExpiring),this.userManager.events.removeUserUnloaded(this.onUserUnloaded),this.userManager.events.removeUserSignedOut(this.onUserSignedOut)}},{key:"render",value:function(){return a.default.Children.only(this.props.children)}}]),r}(a.default.Component);l.propTypes={userManager:c.PropTypes.object.isRequired,store:c.PropTypes.object.isRequired},r.default=l},function(e,r,n){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}function o(){var e=(0,s.default)();e.signinSilentCallback()}Object.defineProperty(r,"__esModule",{value:!0}),r.default=o;var i=n(2),s=t(i)},function(e,r,n){"use strict";function t(e){return e&&e.__esModule?e:{default:e}}function o(e){r.storedUser=f=e}function i(){r.storedUser=f=null}function s(e){console.error("Error in oidcMiddleware",e)}function u(e,n,t){var o;return regeneratorRuntime.wrap(function(i){for(;;)switch(i.prev=i.next){case 0:if(f&&!f.expired){i.next=6;break}return e((0,a.loadingUser)()),i.next=4,t.getUser();case 4:o=i.sent,!o||o.expired?e((0,a.userExpired)()):(r.storedUser=f=o,e((0,a.userFound)(o)));case 6:return i.abrupt("return",e(n));case 7:case"end":return i.stop()}},E[0],this)}function c(e){if(!e||!e.getUser)throw new Error("You must provide a user manager!");return function(r){return function(r){return function(n){(0,l.default)(u(r,n,e)).catch(s)}}}}Object.defineProperty(r,"__esModule",{value:!0}),r.storedUser=void 0,r.setStoredUser=o,r.removeStoredUser=i,r.errorCallback=s,r.middlewareHandler=u,r.default=c;var a=n(1),d=n(11),l=t(d),E=[u].map(regeneratorRuntime.mark),f=r.storedUser=null},function(e,r,n){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var t=n(0),o=void 0;try{!function(){var e=n(12).fromJS,r=e({user:null,isLoadingUser:!1});o=function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:r,o=arguments[1];switch(o.type){case t.USER_EXPIRED:return n.set("isLoadingUser",!1);case t.SILENT_RENEW_ERROR:return n.set("isLoadingUser",!1);case t.SESSION_TERMINATED:case t.USER_SIGNED_OUT:return e({user:null,isLoadingUser:!1});case t.REDIRECT_SUCCESS:case t.USER_FOUND:return e({user:o.payload,isLoadingUser:!1});case t.LOADING_USER:return n.set("isLoadingUser",!0);default:return n}}}()}catch(e){o=function(){console.error("You must install immutable-js for this to work!")}}r.default=o},function(e,r,n){"use strict";function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:s,r=arguments[1];switch(r.type){case i.USER_EXPIRED:return Object.assign({},o({},e),{user:null,isLoadingUser:!1});case i.SILENT_RENEW_ERROR:return Object.assign({},o({},e),{isLoadingUser:!1});case i.SESSION_TERMINATED:case i.USER_SIGNED_OUT:return Object.assign({},o({},e),{user:null,isLoadingUser:!1});case i.REDIRECT_SUCCESS:case i.USER_FOUND:return Object.assign({},o({},e),{user:r.payload,isLoadingUser:!1});case i.LOADING_USER:return Object.assign({},o({},e),{isLoadingUser:!0});default:return e}}Object.defineProperty(r,"__esModule",{value:!0});var o=Object.assign||function(e){for(var r=1;r<arguments.length;r++){var n=arguments[r];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t])}return e};r.default=t;var i=n(0),s={user:null,isLoadingUser:!1}},function(e,r){e.exports=require("co")},function(e,r){e.exports=require("immutable")},function(e,r){e.exports=require("oidc-client")},function(e,r,n){e.exports=n(4)}])});
\ No newline at end of file
diff --git a/package.json b/package.json
index 303c2f2..e5cc671 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-oidc",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "A package for managing OpenID Connect authentication in redux apps",
   "main": "dist/redux-oidc.js",
   "scripts": {
@@ -26,41 +26,34 @@
   "author": "Maximilian Mantz",
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "^6.4.5",
-    "babel-eslint": "^4.1.8",
-    "babel-loader": "^6.2.1",
-    "babel-plugin-rewire": "^1.0.0-rc-2",
+    "babel-core": "^6.21.0",
+    "babel-eslint": "^7.1.1",
+    "babel-loader": "^6.2.10",
+    "babel-plugin-rewire": "^1.0.0",
     "babel-plugin-uglify": "^1.0.2",
-    "babel-polyfill": "^6.7.4",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
-    "babel-register": "^6.7.2",
-    "babel-require": "^1.0.1",
-    "babel-template": "^6.7.0",
-    "babel-types": "^6.7.2",
-    "browserify": "^13.0.0",
+    "babel-polyfill": "^6.20.0",
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-0": "^6.16.0",
+    "babel-register": "^6.18.0",
+    "babel-template": "^6.16.0",
+    "babel-types": "^6.21.0",
+    "browserify": "^13.3.0",
     "chai": "^3.5.0",
-    "chai-enzyme": "^0.4.2",
-    "cheerio": "^0.20.0",
+    "cheerio": "^0.22.0",
     "co-mocha": "^1.1.3",
-    "enzyme": "^2.2.0",
+    "enzyme": "^2.7.0",
     "es6-promise": "^4.0.5",
-    "expect": "^1.12.2",
-    "expect-jsx": "^2.1.2",
-    "file-loader": "^0.8.4",
-    "fs": "0.0.2",
-    "istanbul-instrumenter-loader": "^0.2.0",
-    "jsdom": "^8.3.0",
+    "expect": "^1.20.2",
+    "file-loader": "^0.9.0",
+    "jsdom": "^9.9.1",
     "json-loader": "^0.5.4",
-    "mocha": "^2.4.5",
-    "mocha-webpack": "^0.3.1",
+    "mocha": "^3.2.0",
+    "mocha-webpack": "^0.7.0",
     "node-storage-shim": "^1.0.1",
-    "react-addons-test-utils": "^15.1.0",
-    "react-shallow-testutils": "^2.0.0",
-    "sinon": "^1.17.3",
-    "webpack": "^1.12.14",
-    "webpack-node-externals": "^1.2.0"
+    "sinon": "^1.17.7",
+    "webpack": "^2.2.0",
+    "webpack-node-externals": "^1.5.4"
   },
   "peerDependencies": {
     "co": ">=4.6.0",
diff --git a/src/CallbackComponent.js b/src/CallbackComponent.js
index 8e2f252..dc6599e 100644
--- a/src/CallbackComponent.js
+++ b/src/CallbackComponent.js
@@ -3,6 +3,9 @@ import { redirectSuccess } from './actions';
 
 class CallbackComponent extends React.Component {
   static propTypes = {
+    // the content to render
+    children: PropTypes.element.isRequired,
+
     // the userManager
     userManager: PropTypes.object.isRequired,
 
@@ -10,14 +13,11 @@ class CallbackComponent extends React.Component {
     successCallback: PropTypes.func.isRequired,
 
     // a function invoked when the callback fails
-    errorCallback: PropTypes.func,
-
-    // the route this component is registered in (react-router or similar library)
-    route: PropTypes.string
+    errorCallback: PropTypes.func
   };
 
   componentDidMount() {
-    this.props.userManager.signinRedirectCallback(this.props.route)
+    this.props.userManager.signinRedirectCallback()
       .then((user) => this.onRedirectSuccess(user))
       .catch((error) => this.onRedirectError(error));
   }
@@ -34,16 +34,8 @@ class CallbackComponent extends React.Component {
     }
   };
 
-  get defaultContent() {
-    return <div>Redirecting...</div>;
-  }
-
   render() {
-    return (
-      <div>
-        {this.props.children || this.defaultContent}
-      </div>
-    );
+    return React.Children.only(this.props.children);
   }
 }
 
diff --git a/tests/callbackComponent.test.js b/tests/callbackComponent.test.js
index 5c2da12..f127dd7 100644
--- a/tests/callbackComponent.test.js
+++ b/tests/callbackComponent.test.js
@@ -1,5 +1,4 @@
 import './setup';
-import ReactTestUtils from 'react-addons-test-utils';
 import expect from 'expect';
 import React from 'react';
 import CallbackComponent from '../src/CallbackComponent';
@@ -70,15 +69,4 @@ describe('<CallbackComponent />', () => {
 
     expect(() => component.onRedirectError(error)).toThrow(/error/);
   });
-
-  it('should call the signinSilentCallback with a route when it has been provided', () => {
-    const route = '/some/route';
-    props = { ...props, route };
-    component = new CallbackComponent(props);
-    component.props = Object.assign({}, { ...component.props }, { ...propsMock });
-
-    component.componentDidMount();
-
-    expect(signinRedirectCallbackStub.calledWith(route)).toEqual(true);
-  });
 });
diff --git a/tests/setup.js b/tests/setup.js
index 7ffc49f..f581a0e 100644
--- a/tests/setup.js
+++ b/tests/setup.js
@@ -1,7 +1,6 @@
 import jsdom from 'jsdom';
 import StorageShim from 'node-storage-shim';
 
-
 const DEFAULT_HTML = '<html><body></body></html>';
 
 global.document = jsdom.jsdom(DEFAULT_HTML);
diff --git a/webpack.config-test.js b/webpack.config-test.js
index b7172c2..cfd49d5 100644
--- a/webpack.config-test.js
+++ b/webpack.config-test.js
@@ -8,7 +8,7 @@ module.exports = {
     loaders: [
       {
         test: /\.js$/,
-        loader: 'babel?plugins=rewire',
+        loader: 'babel-loader?plugins=rewire',
         exclude: /node_modules/
       }
     ]
diff --git a/webpack.config.js b/webpack.config.js
index 02d7df8..86da661 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,7 +16,7 @@ module.exports = {
     loaders: [
       {
         test: /\.js$/,
-        loader: 'babel',
+        loader: 'babel-loader',
         exclude: /node_modules/
       }
     ]