Fix broken code example
Merging 'master' into 'gh-pages'