changes from oakley
Merge branch 'gh-pages' into preview