Style fix
Examples fix
Merge branch 'master' into gh-pages