updated HTML 5 ver.
this short tags thing is correct so no patching is needed.