base setup
base setup ii
Merge branch 'master' into gh-pages