Merge pull request #156 from AlexisEidelman/datatable

Datatable
Syncing with dev
Merge pull request #157 from benjello/datatable

Syncing with dev
liam verif
TH