Merge pull request #241 from gforcada/master

80 characters per line
Linkify and some typos