Feature - Empty table -- Fix #26