Merge branch 'gh-pages'
change based on simons ideas
Merge branch 'master' into gh-pages