W3C compliance
Merge branch 'devel'