readme
add an example
Merge branch 'master' into gh-pages