Merge pull request #240 from gforcada/master

80 characters per line and a updated a dead link
80 characters per line