Add more table options
Merge branch 'master' into gh-pages