added example
updates after building example
Merge branch 'master' into gh-pages