Update, fix and remove links
Merge pull request #244 from gforcada/master

Update, fix and remove links