Merge branch 'task1-3' into gh-pages