Add work in progress warning
Merge branch 'master' into gh-pages