Rename some stuff
update example
Merge branch 'master' into gh-pages