All ids converted to classes
Merge branch 'master' into gh-pages