Add table support
Merge pull request #8 from iostaf/master

Add table support