Merge pull request #11 from adanot/Table-adjustments

Table adjustments