Merge branch 'master' into gh-pages
added info table
Merge branch 'gh-pages'