better images
TODO crossover
Merge branch 'master' into gh-pages