Some more changes
Merge https://github.com/hstaykov/html5