diff --git a/dist/cjs/Table.js b/dist/cjs/Table.js
index 72e9216..db1a4ef 100644
--- a/dist/cjs/Table.js
+++ b/dist/cjs/Table.js
@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactHotLoader = require("react-hot-loader");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
@@ -164,12 +162,12 @@ _defineProperty(ColumnGroup, "defaultProps", {
 
 function isColumnGroup(child) {
   child = child || {};
-  return (0, _reactHotLoader.areComponentsEqual)(child.type, ColumnGroup);
+  return child && child.type === ColumnGroup;
 }
 
 function isColumn(child) {
   child = child || {};
-  return (0, _reactHotLoader.areComponentsEqual)(child.type, Column);
+  return child && child.type === Column;
 }
 
 function getColumns(children) {
diff --git a/dist/es/Table.js b/dist/es/Table.js
index 69f5b5a..41889a3 100644
--- a/dist/es/Table.js
+++ b/dist/es/Table.js
@@ -26,7 +26,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { areComponentsEqual } from 'react-hot-loader';
 var defaultClickableClass = 'clickable';
 
 var noop = function noop() {};
@@ -144,12 +143,12 @@ _defineProperty(ColumnGroup, "defaultProps", {
 
 function isColumnGroup(child) {
   child = child || {};
-  return areComponentsEqual(child.type, ColumnGroup);
+  return child && child.type === ColumnGroup;
 }
 
 function isColumn(child) {
   child = child || {};
-  return areComponentsEqual(child.type, Column);
+  return child && child.type === Column;
 }
 
 function getColumns(children) {
diff --git a/dist/umd/c2-table.js b/dist/umd/c2-table.js
index 6c383d8..de480df 100644
--- a/dist/umd/c2-table.js
+++ b/dist/umd/c2-table.js
@@ -1 +1 @@
-!function(e,r){"object"==typeof exports&&"object"==typeof module?module.exports=r(require("prop-types"),require("react")):"function"==typeof define&&define.amd?define(["prop-types","react"],r):"object"==typeof exports?exports.C2Table=r(require("prop-types"),require("react")):e.C2Table=r(e.PropTypes,e.React)}(window,function(__WEBPACK_EXTERNAL_MODULE__0__,__WEBPACK_EXTERNAL_MODULE__1__){return function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=4)}([function(e,r){e.exports=__WEBPACK_EXTERNAL_MODULE__0__},function(e,r){e.exports=__WEBPACK_EXTERNAL_MODULE__1__},function(module,exports,__webpack_require__){"use strict";var evalAllowed=!1;try{eval("evalAllowed = true")}catch(e){}var platformSupported=!!Object.setPrototypeOf&&evalAllowed;module.exports=__webpack_require__(3)},function(e,r,t){"use strict";Object.defineProperty(r,"__esModule",{value:!0});var n=function(e){return e&&"object"==typeof e&&"default"in e?e.default:e}(t(1)),o=function(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")},a=function(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},s=function(e){function r(){return o(this,r),a(this,e.apply(this,arguments))}return function(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)}(r,e),r.prototype.render=function(){return n.Children.only(this.props.children)},r}(n.Component);r.AppContainer=s,r.hot=function(){return function(e){return e}},r.areComponentsEqual=function(e,r){return e===r},r.setConfig=function(){},r.cold=function(e){return e}},function(e,r,t){"use strict";t.r(r);var n=t(1),o=t.n(n),a=t(0),s=t.n(a),i=t(2);function l(e,r){if(null==e)return{};var t,n,o=function(e,r){if(null==e)return{};var t,n,o={},a=Object.keys(e);for(n=0;n<a.length;n++)t=a[n],r.indexOf(t)>=0||(o[t]=e[t]);return o}(e,r);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(n=0;n<a.length;n++)t=a[n],r.indexOf(t)>=0||Object.prototype.propertyIsEnumerable.call(e,t)&&(o[t]=e[t])}return o}function p(e){return(p="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function c(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function u(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)}}function d(e,r,t){return r&&u(e.prototype,r),t&&u(e,t),e}function f(e,r){return!r||"object"!==p(r)&&"function"!=typeof r?h(e):r}function h(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function m(e){return(m=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function y(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),r&&C(e,r)}function C(e,r){return(C=Object.setPrototypeOf||function(e,r){return e.__proto__=r,e})(e,r)}function b(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}var E=function(){},v=s.a.oneOfType([s.a.string,s.a.func]),O=s.a.oneOfType([s.a.string,s.a.object]),x=s.a.oneOfType([s.a.string,s.a.object,s.a.func]),g=function(e){function r(){return c(this,r),f(this,m(r).apply(this,arguments))}return y(r,n["Component"]),d(r,[{key:"render",value:function(){throw new Error("<Column> is not meant to be rendered.")}}]),r}();b(g,"_colType","c2-table-column"),b(g,"propTypes",{id:s.a.string.isRequired,header:s.a.oneOfType([s.a.string,s.a.func]),headerClassName:x,cellClassName:s.a.any,footerClassName:O,footer:s.a.func,cell:v,orderValue:v,sortOnHeaderClick:s.a.bool,sort:s.a.func}),b(g,"defaultProps",{sortOnHeaderClick:!0});var w=function(e){function r(){return c(this,r),f(this,m(r).apply(this,arguments))}return y(r,n["Component"]),d(r,[{key:"render",value:function(){throw new Error("<ColumnGroup> is not meant to be rendered.")}}]),r}();function k(e){return e=e||{},Object(i.areComponentsEqual)(e.type,w)}function _(e){return e=e||{},Object(i.areComponentsEqual)(e.type,g)}function N(e){return o.a.Children.toArray(e).filter(function(e){return!!e})}b(w,"_colType","c2-table-column-group"),b(w,"propTypes",{id:s.a.string.isRequired,children:s.a.arrayOf(function(e,r){if(e[r]&&!_(e[r]))throw new Error("<ColumnGroup> can only have <Column>'s as children. ")}).isRequired,headerClassName:x,sortOnHeaderClick:s.a.bool,sort:s.a.func}),b(w,"defaultProps",{sortOnHeaderClick:!0});var S=function(e,r){var t;o.a.Children.forEach(e[r],function(e){return k(e)||_(e)||(t=new Error("Invalid Table children.")),t})},D=o.a.createContext({row:null,index:null,rowId:null,expanded:null,expand:function(){},collapse:function(){},toggleExpanded:function(){}}),I=function(e){function r(){var e,t;c(this,r);for(var n=arguments.length,o=new Array(n),a=0;a<n;a++)o[a]=arguments[a];return b(h(h(t=f(this,(e=m(r)).call.apply(e,[this].concat(o))))),"onHeaderClick",function(){var e="asc"!==t.props.orderDir&&t.props.orderDir?"asc":"desc";t.props.setOrderColumn(t.props.id),t.props.setOrderDir(e),t.props.onSort(t.props.id,e)}),t}return y(r,n["Component"]),d(r,[{key:"headerContent",value:function(){switch(p(this.props.header)){case"function":return this.props.header(this.getSortSymbol(),this.onHeaderClick);default:return o.a.createElement("span",null,this.props.header||this.props.id," ",this.getSortSymbol())}}},{key:"isCurrentSortColumn",value:function(){return this.props.orderColumn===this.props.id}},{key:"getSortSymbol",value:function(e){var r=this.props,t=r.sortDescIcon,n=r.sortAscIcon;return this.isCurrentSortColumn(e)?"asc"===this.props.orderDir?o.a.createElement("span",null,n||"↑"):o.a.createElement("span",null,t||"↓"):null}},{key:"getClickableClass",value:function(){return!1===this.props.sortOnHeaderClick?null:this.props.clickableClass||"clickable"}},{key:"renderFirstRowHeader",value:function(){var e=this.props.children?this.props.children.length:1;return o.a.createElement("th",{colSpan:e||1,rowSpan:this.props.hasGroups&&1===e?2:1,onClick:!1===this.props.sortOnHeaderClick?E:this.onHeaderClick,className:"".concat(this.props.className||""," ").concat(this.getClickableClass()).trim(),"data-testid":"header-".concat(this.props.id)},this.headerContent())}},{key:"renderSecondRowHeader",value:function(){return o.a.createElement("th",{key:this.props.id,onClick:this.onHeaderClick,className:"".concat(this.props.className||""," ").concat(this.getClickableClass()).trim()},this.headerContent())}},{key:"render",value:function(){return this.props.isFirstRow?this.renderFirstRowHeader():this.renderSecondRowHeader()}}]),r}();b(I,"propTypes",{id:s.a.string.isRequired,orderColumn:s.a.string,orderDir:s.a.string,setOrderColumn:s.a.func.isRequired,setOrderDir:s.a.func.isRequired,sortOnHeaderClick:s.a.bool,clickableClass:s.a.string,children:S,hasGroups:s.a.bool,className:O,isFirstRow:s.a.bool,header:s.a.oneOfType([s.a.string,s.a.func]),sortDescIcon:s.a.any,sortAscIcon:s.a.any,onSort:s.a.func}),b(I,"defaultProps",{onSort:function(){}});var P=function(e){function r(){return c(this,r),f(this,m(r).apply(this,arguments))}return y(r,n["Component"]),d(r,[{key:"hasGroups",value:function(){var e=!1;return o.a.Children.forEach(this.props.children,function(r){k(r)&&(e=!0)}),e}},{key:"renderFirstRow",value:function(){var e=this,r=this.hasGroups();return o.a.createElement("tr",null,this.props.onExpand?o.a.createElement("th",{rowSpan:r?2:1,className:this.props.expandClassName}):null,N(this.props.children).map(function(t){return o.a.createElement(I,{key:t.props.id,orderColumn:e.props.orderColumn,orderDir:e.props.orderDir,setOrderColumn:e.props.setOrderColumn,setOrderDir:e.props.setOrderDir,clickableClass:e.props.clickableClass,onSort:e.props.onSort,sortDescIcon:e.props.sortDescIcon,sortAscIcon:e.props.sortAscIcon,id:t.props.id,header:t.props.header,className:t.props.headerClassName,sortOnHeaderClick:t.props.sortOnHeaderClick,hasGroups:r,isFirstRow:!0},t.props.children)}))}},{key:"renderSecondRow",value:function(){var e=this;return o.a.createElement("tr",null,N(this.props.children).map(function(r){return k(r)?N(r.props.children).map(function(r){return o.a.createElement(I,{key:r.props.id,orderColumn:e.props.orderColumn,orderDir:e.props.orderDir,setOrderColumn:e.props.setOrderColumn,setOrderDir:e.props.setOrderDir,clickableClass:e.props.clickableClass,onSort:e.props.onSort,sortDescIcon:e.props.sortDescIcon,sortAscIcon:e.props.sortAscIcon,id:r.props.id,header:r.props.header,className:r.props.headerClassName,sortOnHeaderClick:r.props.sortOnHeaderClick,children:r.props.children})}):null}))}},{key:"render",value:function(){return o.a.createElement("thead",null,this.renderFirstRow(),this.hasGroups()?this.renderSecondRow():null)}}]),r}();function j(e){var r=[];return N(e).forEach(function(e){k(e)?r=r.concat(j(e.props.children)):r.push(e)}),r.filter(function(e){return!!e})}function R(e){var r=e.rowId,t=e.row,n=e.index,a=e.expanded,s=e.setExpanded,i=e.children,p=l(e,["rowId","row","index","expanded","setExpanded","children"]),c=o.a.useCallback(function(){return s(r,!0)},[r,s]),u=o.a.useCallback(function(){return s(r,!1)},[r,s]),d=o.a.useMemo(function(){return{rowId:r,row:t,index:n,expanded:a,toggleExpanded:function(){return s(r,!a)},expand:c,collapse:u}},[r,t,n,a,s,c,u]);return o.a.createElement(D.Provider,{value:d},o.a.createElement("tr",p,i))}b(P,"propTypes",{children:S,onExpand:s.a.func,expandClassName:O,orderColumn:s.a.string,orderDir:s.a.string,setOrderColumn:s.a.func.isRequired,setOrderDir:s.a.func.isRequired,clickableClass:s.a.string,sortDescIcon:s.a.any,sortAscIcon:s.a.any,onSort:s.a.func});var T=function(e){function r(e){var t;c(this,r),b(h(h(t=f(this,m(r).call(this,e)))),"setExpanded",function(e,r){t.setState({expanded:function(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{},n=Object.keys(t);"function"==typeof Object.getOwnPropertySymbols&&(n=n.concat(Object.getOwnPropertySymbols(t).filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.forEach(function(r){b(e,r,t[r])})}return e}({},t.state.expanded,b({},e,r))})}),b(h(h(t)),"getRowClassName",function(e,r){var n=t.props.rowClassName;return"string"==typeof n?n:"function"==typeof n?n(e,r):""});var n={};return e.expanded&&e.expanded.forEach(function(e){n[e]=!0}),t.state={expanded:n},t}return y(r,n["Component"]),d(r,[{key:"cellClassName",value:function(e,r,t){return"function"==typeof e.props.cellClassName?e.props.cellClassName(r,t):e.props.cellClassName}},{key:"expandCell",value:function(e,r){var t=this,n=this.props,a=n.rowId,s=n.expandClassName,i=n.clickableClass,l=n.collapsedIcon,p=n.expandedIcon,c=A(a,e,r);return o.a.createElement("td",{className:"".concat(s||""," ").concat(i||"clickable").trim(),onClick:function(){var e=t.state.expanded;e[c]=!e[c],t.setState({expanded:e})}},this.state.expanded[c]?p||"-":l||"+")}},{key:"render",value:function(){var e=this,r=this.props,t=r.children,n=r.rowId,a=r.onExpand,s=r.onEmpty,i=r.isFullLength,l=r.fullLengthCell,c=this.props.id,u=j(t),d=[];return(this.props.data||[]).forEach(function(r,t){var s=e.getRowClassName(r,t),f=A(n,r,t),h="".concat(c,"-").concat(f),m=e.state.expanded[f]||!1;i&&i(r,t)?d.push(o.a.createElement(R,{key:"tr-".concat(h),id:"tr-".concat(h),rowId:f,row:r,index:t,expanded:m,setExpanded:e.setExpanded,className:s},o.a.createElement("td",{colSpan:u.length+(a?1:0)},l(r,t)))):d.push(o.a.createElement(R,{key:"tr-".concat(h),id:"tr-".concat(h),rowId:f,row:r,index:t,expanded:m,setExpanded:e.setExpanded,className:s},a?e.expandCell(r,t):null,u.map(function(n){return o.a.createElement("td",{key:"td-".concat(h,"-").concat(n.props.id),className:e.cellClassName(n,r,t)},function(e,r,t){switch(p(e.props.cell)){case"function":return e.props.cell(r,t);default:return r[e.props.cell||e.props.id]}}(n,r,t))}))),a&&e.state.expanded[f]&&d.push(o.a.createElement(R,{key:"tr-".concat(h,"-expanded"),rowId:f,row:r,index:t,expanded:m,setExpanded:e.setExpanded,className:"".concat(s,"-expanded")},o.a.createElement("td",{colSpan:u.length+1},o.a.createElement(a,{row:r}))))}),0===d.length&&d.push(o.a.createElement("tr",{key:"tr-empty"},o.a.createElement("td",{colSpan:u.length+(a?1:0)},s||o.a.createElement("div",{className:"text-center"},"No data...")))),o.a.createElement("tbody",null,d)}}]),r}();function A(e,r,t){switch(p(e)){case"function":return e(r,t);default:return r[e]}}b(T,"propTypes",{rowId:v.isRequired,expandClassName:O,clickableClass:s.a.string,children:S,id:s.a.string.isRequired,onExpand:s.a.func,data:s.a.array.isRequired,expandedIcon:s.a.any,collapsedIcon:s.a.any,expanded:s.a.array,onEmpty:s.a.node,rowClassName:v,isFullLength:s.a.func,fullLengthCell:s.a.func});var q=function(e){function r(){var e,t;c(this,r);for(var n=arguments.length,o=new Array(n),a=0;a<n;a++)o[a]=arguments[a];return b(h(h(t=f(this,(e=m(r)).call.apply(e,[this].concat(o))))),"state",{}),b(h(h(t)),"setOrderColumn",function(e){t.props.sortEnabled&&t.setState({orderColumn:e})}),b(h(h(t)),"setOrderDir",function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"desc";t.props.sortEnabled&&t.setState({orderDir:e})}),b(h(h(t)),"getPagedData",function(){var e=t.getData();if(void 0===t.props.page||void 0===t.props.rowsPerPage)return e;var r=t.props.page*t.props.rowsPerPage,n=r+t.props.rowsPerPage;return e.slice(r,n)}),t}return y(r,n["Component"]),d(r,[{key:"componentDidMount",value:function(){this.props.defaultOrderColumn&&this.setOrderColumn(this.props.defaultOrderColumn),this.setOrderDir(this.props.defaultOrderDir)}},{key:"getColumns",value:function(){return j(this.props.children)}},{key:"getData",value:function(){var e=this.state,r=e.orderColumn,t=e.orderDir,n=this.props.data,o=function(e,r){var t=N(e).find(function(e){return e.props.id===r});return t||j(e).find(function(e){return e.props.id===r})}(this.props.children,r);return o?"function"==typeof o.props.sort?o.props.sort(n,t):(n=n.map(function(e){return{row:e,orderValue:function(e,r){switch(p(e.props.orderValue)){case"function":return e.props.orderValue(r);default:return r[e.props.orderValue||e.props.id]}}(o,e)}})).sort(function(e,r){var n="string"==typeof e.orderValue?"":0;if(e=e.orderValue||n,r=r.orderValue||n,"asc"===t){if(e>r)return 1;if(e<r)return-1}else{if(e<r)return 1;if(e>r)return-1}return 0}).map(function(e){return e.row}):n}},{key:"render",value:function(){var e=this.getData(),r=this.getPagedData();return o.a.createElement("table",{className:this.props.className,id:this.props.id,style:this.props.style},o.a.createElement(P,{id:this.props.id,orderColumn:this.state.orderColumn,orderDir:this.state.orderDir,setOrderColumn:this.setOrderColumn,setOrderDir:this.setOrderDir,children:this.props.children,onExpand:this.props.onExpand,expandClassName:this.props.expandClassName,clickableClass:this.props.sortEnabled?this.props.clickableClass:"c2-table-disabled",sortDescIcon:this.props.sortDescIcon,sortAscIcon:this.props.sortAscIcon,onSort:this.props.onSort}),o.a.createElement(T,{id:this.props.id,rowId:this.props.rowId,expandClassName:this.props.expandClassName,clickableClass:this.props.clickableClass,children:this.props.children,expandedIcon:this.props.expandedIcon,collapsedIcon:this.props.collapsedIcon,onExpand:this.props.onExpand,expanded:this.props.expanded,onEmpty:this.props.onEmpty,rowClassName:this.props.rowClassName,isFullLength:this.props.isFullLength,fullLengthCell:this.props.fullLengthCell,data:r}),o.a.createElement(H,{children:this.props.children,onExpand:this.props.onExpand,data:e}))}}]),r}();b(q,"propTypes",{id:s.a.string.isRequired,rowId:s.a.oneOfType([s.a.string,s.a.func]).isRequired,data:s.a.array.isRequired,defaultOrderColumn:s.a.string,defaultOrderDir:s.a.oneOf(["asc","desc"]),sortEnabled:s.a.bool,children:S,style:s.a.object,className:O,rowClassName:v,expandClassName:O,clickableClass:s.a.string,page:s.a.number,rowsPerPage:s.a.number,onExpand:s.a.func,expanded:s.a.array,expandedIcon:s.a.any,collapsedIcon:s.a.any,onEmpty:s.a.node,sortDescIcon:s.a.any,sortAscIcon:s.a.any,onSort:s.a.func,isFullLength:s.a.func,fullLengthCell:s.a.func}),b(q,"defaultProps",{sortEnabled:!0});var H=function(e){function r(){return c(this,r),f(this,m(r).apply(this,arguments))}return y(r,n["Component"]),d(r,[{key:"render",value:function(){var e=this;return this.props.children&&j(this.props.children).reduce(function(e,r){return e||r.props.footer},!1)&&this.props.data.length?o.a.createElement("tfoot",null,o.a.createElement("tr",null,this.props.onExpand?o.a.createElement("td",null):null,j(this.props.children).map(function(r){return o.a.createElement("td",{key:r.props.id,className:r.props.footerClassName||""},r.props.footer?r.props.footer(e.props.data):null)}))):null}}]),r}();b(H,"defaultProps",{data:[]}),b(H,"propTypes",{children:s.a.node,onExpand:s.a.func,data:s.a.array}),t.d(r,"Table",function(){return q}),t.d(r,"Column",function(){return g}),t.d(r,"ColumnGroup",function(){return w}),t.d(r,"RowContext",function(){return D})}])});
\ No newline at end of file
+!function(e,r){"object"==typeof exports&&"object"==typeof module?module.exports=r(require("prop-types"),require("react")):"function"==typeof define&&define.amd?define(["prop-types","react"],r):"object"==typeof exports?exports.C2Table=r(require("prop-types"),require("react")):e.C2Table=r(e.PropTypes,e.React)}(window,function(e,r){return function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=2)}([function(r,t){r.exports=e},function(e,t){e.exports=r},function(e,r,t){"use strict";t.r(r);var n=t(1),o=t.n(n),a=t(0),s=t.n(a);function i(e,r){if(null==e)return{};var t,n,o=function(e,r){if(null==e)return{};var t,n,o={},a=Object.keys(e);for(n=0;n<a.length;n++)t=a[n],r.indexOf(t)>=0||(o[t]=e[t]);return o}(e,r);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(n=0;n<a.length;n++)t=a[n],r.indexOf(t)>=0||Object.prototype.propertyIsEnumerable.call(e,t)&&(o[t]=e[t])}return o}function l(e){return(l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function p(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function c(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)}}function u(e,r,t){return r&&c(e.prototype,r),t&&c(e,t),e}function d(e,r){return!r||"object"!==l(r)&&"function"!=typeof r?f(e):r}function f(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function h(e){return(h=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function m(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),r&&y(e,r)}function y(e,r){return(y=Object.setPrototypeOf||function(e,r){return e.__proto__=r,e})(e,r)}function C(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}var b=function(){},g=s.a.oneOfType([s.a.string,s.a.func]),x=s.a.oneOfType([s.a.string,s.a.object]),v=s.a.oneOfType([s.a.string,s.a.object,s.a.func]),E=function(e){function r(){return p(this,r),d(this,h(r).apply(this,arguments))}return m(r,n["Component"]),u(r,[{key:"render",value:function(){throw new Error("<Column> is not meant to be rendered.")}}]),r}();C(E,"_colType","c2-table-column"),C(E,"propTypes",{id:s.a.string.isRequired,header:s.a.oneOfType([s.a.string,s.a.func]),headerClassName:v,cellClassName:s.a.any,footerClassName:x,footer:s.a.func,cell:g,orderValue:g,sortOnHeaderClick:s.a.bool,sort:s.a.func}),C(E,"defaultProps",{sortOnHeaderClick:!0});var O=function(e){function r(){return p(this,r),d(this,h(r).apply(this,arguments))}return m(r,n["Component"]),u(r,[{key:"render",value:function(){throw new Error("<ColumnGroup> is not meant to be rendered.")}}]),r}();function w(e){return(e=e||{})&&e.type===O}function k(e){return(e=e||{})&&e.type===E}function S(e){return o.a.Children.toArray(e).filter(function(e){return!!e})}C(O,"_colType","c2-table-column-group"),C(O,"propTypes",{id:s.a.string.isRequired,children:s.a.arrayOf(function(e,r){if(e[r]&&!k(e[r]))throw new Error("<ColumnGroup> can only have <Column>'s as children. ")}).isRequired,headerClassName:v,sortOnHeaderClick:s.a.bool,sort:s.a.func}),C(O,"defaultProps",{sortOnHeaderClick:!0});var N=function(e,r){var t;o.a.Children.forEach(e[r],function(e){return w(e)||k(e)||(t=new Error("Invalid Table children.")),t})},I=o.a.createContext({row:null,index:null,rowId:null,expanded:null,expand:function(){},collapse:function(){},toggleExpanded:function(){}}),D=function(e){function r(){var e,t;p(this,r);for(var n=arguments.length,o=new Array(n),a=0;a<n;a++)o[a]=arguments[a];return C(f(f(t=d(this,(e=h(r)).call.apply(e,[this].concat(o))))),"onHeaderClick",function(){var e="asc"!==t.props.orderDir&&t.props.orderDir?"asc":"desc";t.props.setOrderColumn(t.props.id),t.props.setOrderDir(e),t.props.onSort(t.props.id,e)}),t}return m(r,n["Component"]),u(r,[{key:"headerContent",value:function(){switch(l(this.props.header)){case"function":return this.props.header(this.getSortSymbol(),this.onHeaderClick);default:return o.a.createElement("span",null,this.props.header||this.props.id," ",this.getSortSymbol())}}},{key:"isCurrentSortColumn",value:function(){return this.props.orderColumn===this.props.id}},{key:"getSortSymbol",value:function(e){var r=this.props,t=r.sortDescIcon,n=r.sortAscIcon;return this.isCurrentSortColumn(e)?"asc"===this.props.orderDir?o.a.createElement("span",null,n||"↑"):o.a.createElement("span",null,t||"↓"):null}},{key:"getClickableClass",value:function(){return!1===this.props.sortOnHeaderClick?null:this.props.clickableClass||"clickable"}},{key:"renderFirstRowHeader",value:function(){var e=this.props.children?this.props.children.length:1;return o.a.createElement("th",{colSpan:e||1,rowSpan:this.props.hasGroups&&1===e?2:1,onClick:!1===this.props.sortOnHeaderClick?b:this.onHeaderClick,className:"".concat(this.props.className||""," ").concat(this.getClickableClass()).trim(),"data-testid":"header-".concat(this.props.id)},this.headerContent())}},{key:"renderSecondRowHeader",value:function(){return o.a.createElement("th",{key:this.props.id,onClick:this.onHeaderClick,className:"".concat(this.props.className||""," ").concat(this.getClickableClass()).trim()},this.headerContent())}},{key:"render",value:function(){return this.props.isFirstRow?this.renderFirstRowHeader():this.renderSecondRowHeader()}}]),r}();C(D,"propTypes",{id:s.a.string.isRequired,orderColumn:s.a.string,orderDir:s.a.string,setOrderColumn:s.a.func.isRequired,setOrderDir:s.a.func.isRequired,sortOnHeaderClick:s.a.bool,clickableClass:s.a.string,children:N,hasGroups:s.a.bool,className:x,isFirstRow:s.a.bool,header:s.a.oneOfType([s.a.string,s.a.func]),sortDescIcon:s.a.any,sortAscIcon:s.a.any,onSort:s.a.func}),C(D,"defaultProps",{onSort:function(){}});var P=function(e){function r(){return p(this,r),d(this,h(r).apply(this,arguments))}return m(r,n["Component"]),u(r,[{key:"hasGroups",value:function(){var e=!1;return o.a.Children.forEach(this.props.children,function(r){w(r)&&(e=!0)}),e}},{key:"renderFirstRow",value:function(){var e=this,r=this.hasGroups();return o.a.createElement("tr",null,this.props.onExpand?o.a.createElement("th",{rowSpan:r?2:1,className:this.props.expandClassName}):null,S(this.props.children).map(function(t){return o.a.createElement(D,{key:t.props.id,orderColumn:e.props.orderColumn,orderDir:e.props.orderDir,setOrderColumn:e.props.setOrderColumn,setOrderDir:e.props.setOrderDir,clickableClass:e.props.clickableClass,onSort:e.props.onSort,sortDescIcon:e.props.sortDescIcon,sortAscIcon:e.props.sortAscIcon,id:t.props.id,header:t.props.header,className:t.props.headerClassName,sortOnHeaderClick:t.props.sortOnHeaderClick,hasGroups:r,isFirstRow:!0},t.props.children)}))}},{key:"renderSecondRow",value:function(){var e=this;return o.a.createElement("tr",null,S(this.props.children).map(function(r){return w(r)?S(r.props.children).map(function(r){return o.a.createElement(D,{key:r.props.id,orderColumn:e.props.orderColumn,orderDir:e.props.orderDir,setOrderColumn:e.props.setOrderColumn,setOrderDir:e.props.setOrderDir,clickableClass:e.props.clickableClass,onSort:e.props.onSort,sortDescIcon:e.props.sortDescIcon,sortAscIcon:e.props.sortAscIcon,id:r.props.id,header:r.props.header,className:r.props.headerClassName,sortOnHeaderClick:r.props.sortOnHeaderClick,children:r.props.children})}):null}))}},{key:"render",value:function(){return o.a.createElement("thead",null,this.renderFirstRow(),this.hasGroups()?this.renderSecondRow():null)}}]),r}();function R(e){var r=[];return S(e).forEach(function(e){w(e)?r=r.concat(R(e.props.children)):r.push(e)}),r.filter(function(e){return!!e})}function j(e){var r=e.rowId,t=e.row,n=e.index,a=e.expanded,s=e.setExpanded,l=e.children,p=i(e,["rowId","row","index","expanded","setExpanded","children"]),c=o.a.useCallback(function(){return s(r,!0)},[r,s]),u=o.a.useCallback(function(){return s(r,!1)},[r,s]),d=o.a.useMemo(function(){return{rowId:r,row:t,index:n,expanded:a,toggleExpanded:function(){return s(r,!a)},expand:c,collapse:u}},[r,t,n,a,s,c,u]);return o.a.createElement(I.Provider,{value:d},o.a.createElement("tr",p,l))}C(P,"propTypes",{children:N,onExpand:s.a.func,expandClassName:x,orderColumn:s.a.string,orderDir:s.a.string,setOrderColumn:s.a.func.isRequired,setOrderDir:s.a.func.isRequired,clickableClass:s.a.string,sortDescIcon:s.a.any,sortAscIcon:s.a.any,onSort:s.a.func});var T=function(e){function r(e){var t;p(this,r),C(f(f(t=d(this,h(r).call(this,e)))),"setExpanded",function(e,r){t.setState({expanded:function(e){for(var r=1;r<arguments.length;r++){var t=null!=arguments[r]?arguments[r]:{},n=Object.keys(t);"function"==typeof Object.getOwnPropertySymbols&&(n=n.concat(Object.getOwnPropertySymbols(t).filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.forEach(function(r){C(e,r,t[r])})}return e}({},t.state.expanded,C({},e,r))})}),C(f(f(t)),"getRowClassName",function(e,r){var n=t.props.rowClassName;return"string"==typeof n?n:"function"==typeof n?n(e,r):""});var n={};return e.expanded&&e.expanded.forEach(function(e){n[e]=!0}),t.state={expanded:n},t}return m(r,n["Component"]),u(r,[{key:"cellClassName",value:function(e,r,t){return"function"==typeof e.props.cellClassName?e.props.cellClassName(r,t):e.props.cellClassName}},{key:"expandCell",value:function(e,r){var t=this,n=this.props,a=n.rowId,s=n.expandClassName,i=n.clickableClass,l=n.collapsedIcon,p=n.expandedIcon,c=H(a,e,r);return o.a.createElement("td",{className:"".concat(s||""," ").concat(i||"clickable").trim(),onClick:function(){var e=t.state.expanded;e[c]=!e[c],t.setState({expanded:e})}},this.state.expanded[c]?p||"-":l||"+")}},{key:"render",value:function(){var e=this,r=this.props,t=r.children,n=r.rowId,a=r.onExpand,s=r.onEmpty,i=r.isFullLength,p=r.fullLengthCell,c=this.props.id,u=R(t),d=[];return(this.props.data||[]).forEach(function(r,t){var s=e.getRowClassName(r,t),f=H(n,r,t),h="".concat(c,"-").concat(f),m=e.state.expanded[f]||!1;i&&i(r,t)?d.push(o.a.createElement(j,{key:"tr-".concat(h),id:"tr-".concat(h),rowId:f,row:r,index:t,expanded:m,setExpanded:e.setExpanded,className:s},o.a.createElement("td",{colSpan:u.length+(a?1:0)},p(r,t)))):d.push(o.a.createElement(j,{key:"tr-".concat(h),id:"tr-".concat(h),rowId:f,row:r,index:t,expanded:m,setExpanded:e.setExpanded,className:s},a?e.expandCell(r,t):null,u.map(function(n){return o.a.createElement("td",{key:"td-".concat(h,"-").concat(n.props.id),className:e.cellClassName(n,r,t)},function(e,r,t){switch(l(e.props.cell)){case"function":return e.props.cell(r,t);default:return r[e.props.cell||e.props.id]}}(n,r,t))}))),a&&e.state.expanded[f]&&d.push(o.a.createElement(j,{key:"tr-".concat(h,"-expanded"),rowId:f,row:r,index:t,expanded:m,setExpanded:e.setExpanded,className:"".concat(s,"-expanded")},o.a.createElement("td",{colSpan:u.length+1},o.a.createElement(a,{row:r}))))}),0===d.length&&d.push(o.a.createElement("tr",{key:"tr-empty"},o.a.createElement("td",{colSpan:u.length+(a?1:0)},s||o.a.createElement("div",{className:"text-center"},"No data...")))),o.a.createElement("tbody",null,d)}}]),r}();function H(e,r,t){switch(l(e)){case"function":return e(r,t);default:return r[e]}}C(T,"propTypes",{rowId:g.isRequired,expandClassName:x,clickableClass:s.a.string,children:N,id:s.a.string.isRequired,onExpand:s.a.func,data:s.a.array.isRequired,expandedIcon:s.a.any,collapsedIcon:s.a.any,expanded:s.a.array,onEmpty:s.a.node,rowClassName:g,isFullLength:s.a.func,fullLengthCell:s.a.func});var q=function(e){function r(){var e,t;p(this,r);for(var n=arguments.length,o=new Array(n),a=0;a<n;a++)o[a]=arguments[a];return C(f(f(t=d(this,(e=h(r)).call.apply(e,[this].concat(o))))),"state",{}),C(f(f(t)),"setOrderColumn",function(e){t.props.sortEnabled&&t.setState({orderColumn:e})}),C(f(f(t)),"setOrderDir",function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"desc";t.props.sortEnabled&&t.setState({orderDir:e})}),C(f(f(t)),"getPagedData",function(){var e=t.getData();if(void 0===t.props.page||void 0===t.props.rowsPerPage)return e;var r=t.props.page*t.props.rowsPerPage,n=r+t.props.rowsPerPage;return e.slice(r,n)}),t}return m(r,n["Component"]),u(r,[{key:"componentDidMount",value:function(){this.props.defaultOrderColumn&&this.setOrderColumn(this.props.defaultOrderColumn),this.setOrderDir(this.props.defaultOrderDir)}},{key:"getColumns",value:function(){return R(this.props.children)}},{key:"getData",value:function(){var e=this.state,r=e.orderColumn,t=e.orderDir,n=this.props.data,o=function(e,r){var t=S(e).find(function(e){return e.props.id===r});return t||R(e).find(function(e){return e.props.id===r})}(this.props.children,r);return o?"function"==typeof o.props.sort?o.props.sort(n,t):(n=n.map(function(e){return{row:e,orderValue:function(e,r){switch(l(e.props.orderValue)){case"function":return e.props.orderValue(r);default:return r[e.props.orderValue||e.props.id]}}(o,e)}})).sort(function(e,r){var n="string"==typeof e.orderValue?"":0;if(e=e.orderValue||n,r=r.orderValue||n,"asc"===t){if(e>r)return 1;if(e<r)return-1}else{if(e<r)return 1;if(e>r)return-1}return 0}).map(function(e){return e.row}):n}},{key:"render",value:function(){var e=this.getData(),r=this.getPagedData();return o.a.createElement("table",{className:this.props.className,id:this.props.id,style:this.props.style},o.a.createElement(P,{id:this.props.id,orderColumn:this.state.orderColumn,orderDir:this.state.orderDir,setOrderColumn:this.setOrderColumn,setOrderDir:this.setOrderDir,children:this.props.children,onExpand:this.props.onExpand,expandClassName:this.props.expandClassName,clickableClass:this.props.sortEnabled?this.props.clickableClass:"c2-table-disabled",sortDescIcon:this.props.sortDescIcon,sortAscIcon:this.props.sortAscIcon,onSort:this.props.onSort}),o.a.createElement(T,{id:this.props.id,rowId:this.props.rowId,expandClassName:this.props.expandClassName,clickableClass:this.props.clickableClass,children:this.props.children,expandedIcon:this.props.expandedIcon,collapsedIcon:this.props.collapsedIcon,onExpand:this.props.onExpand,expanded:this.props.expanded,onEmpty:this.props.onEmpty,rowClassName:this.props.rowClassName,isFullLength:this.props.isFullLength,fullLengthCell:this.props.fullLengthCell,data:r}),o.a.createElement(_,{children:this.props.children,onExpand:this.props.onExpand,data:e}))}}]),r}();C(q,"propTypes",{id:s.a.string.isRequired,rowId:s.a.oneOfType([s.a.string,s.a.func]).isRequired,data:s.a.array.isRequired,defaultOrderColumn:s.a.string,defaultOrderDir:s.a.oneOf(["asc","desc"]),sortEnabled:s.a.bool,children:N,style:s.a.object,className:x,rowClassName:g,expandClassName:x,clickableClass:s.a.string,page:s.a.number,rowsPerPage:s.a.number,onExpand:s.a.func,expanded:s.a.array,expandedIcon:s.a.any,collapsedIcon:s.a.any,onEmpty:s.a.node,sortDescIcon:s.a.any,sortAscIcon:s.a.any,onSort:s.a.func,isFullLength:s.a.func,fullLengthCell:s.a.func}),C(q,"defaultProps",{sortEnabled:!0});var _=function(e){function r(){return p(this,r),d(this,h(r).apply(this,arguments))}return m(r,n["Component"]),u(r,[{key:"render",value:function(){var e=this;return this.props.children&&R(this.props.children).reduce(function(e,r){return e||r.props.footer},!1)&&this.props.data.length?o.a.createElement("tfoot",null,o.a.createElement("tr",null,this.props.onExpand?o.a.createElement("td",null):null,R(this.props.children).map(function(r){return o.a.createElement("td",{key:r.props.id,className:r.props.footerClassName||""},r.props.footer?r.props.footer(e.props.data):null)}))):null}}]),r}();C(_,"defaultProps",{data:[]}),C(_,"propTypes",{children:s.a.node,onExpand:s.a.func,data:s.a.array}),t.d(r,"Table",function(){return q}),t.d(r,"Column",function(){return E}),t.d(r,"ColumnGroup",function(){return O}),t.d(r,"RowContext",function(){return I})}])});
\ No newline at end of file
diff --git a/package.json b/package.json
index 347978d..1063e29 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,6 @@
     "react-dom": "^16.8.0"
   },
   "dependencies": {
-    "prop-types": "^15.6.2",
-    "react-hot-loader": "^4.3.11"
+    "prop-types": "^15.6.2"
   }
 }
diff --git a/src/Table.js b/src/Table.js
index ce688d9..08d426c 100644
--- a/src/Table.js
+++ b/src/Table.js
@@ -1,6 +1,5 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import {areComponentsEqual} from 'react-hot-loader'
 
 const defaultClickableClass = 'clickable'
 
@@ -91,12 +90,12 @@ class ColumnGroup extends Component {
 
 function isColumnGroup (child) {
   child = child || {}
-  return areComponentsEqual(child.type, ColumnGroup)
+  return child && child.type === ColumnGroup
 }
 
 function isColumn (child) {
   child = child || {}
-  return areComponentsEqual(child.type, Column)
+  return child && child.type === Column
 }
 
 function getColumns (children) {
diff --git a/yarn.lock b/yarn.lock
index 794944b..02a3523 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8426,10 +8426,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^2.5.0:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
-
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -13603,17 +13599,6 @@ react-hot-loader@^4.12.18:
     shallowequal "^1.1.0"
     source-map "^0.7.3"
 
-react-hot-loader@^4.3.11:
-  version "4.3.11"
-  resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.3.11.tgz#fe5cf7be7700c249b58293f977c1e6e0900f0d87"
-  dependencies:
-    fast-levenshtein "^2.0.6"
-    global "^4.3.0"
-    hoist-non-react-statics "^2.5.0"
-    prop-types "^15.6.1"
-    react-lifecycles-compat "^3.0.4"
-    shallowequal "^1.0.2"
-
 react-is@^16.7.0, react-is@^16.8.1:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
@@ -14944,7 +14929,7 @@ shallow-compare@^1.2.2:
   resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb"
   integrity sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg==
 
-shallowequal@^1.0.2, shallowequal@^1.1.0:
+shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"