move example file
add test
Merge branch 'master' into gh-pages