More W3C
Merge pull request #20 from thePlasm/master

More W3C