Update with Evander2 references for better examples
Merge branch 'master' into gh-pages