Merge pull request #20 from cbyn/alex

finished table refactor