Update master with examples from gh-pages