Closes #16 fixed bugs with datatable control