Activate 04 and 05
Merge branch 'master' into gh-pages