general fix for #70
reverting example
Merge branch 'master' into gh-pages