changes for pull request#14: support for tables