Added ability to chose tabs to display
Merge branch 'master' into gh-pages