unit1: v3 (with assets)
Merge branch 'master' into gh-pages