New upstream release, corrected some missing tags and indentation