Merge pull request #1 from gustavomazevedo/feature-tables

Feature tables is being merged.