merge changes from kusut PR#1085 and stevepiercy PR#1084
wrap to 79 columns
remove duplicate link of Windows extensions at top of file to prevent early clickage