Add some html5 tags, close #4