fixed example to not be off my one
Merge branch 'refs/heads/master' into gh-pages