#27 PR commit for data-tables