Merge pull request #157 from benjello/datatable

Syncing with dev