Merge branch 'third-argument' into gh-pages
Merge branch 'gh-pages' into third-argument