Prepare for multiple difficulty levels.
Merge branch 'master' into gh-pages