Outline Altered, E1 Added
Merge branch 'master' into gh-pages