Merge pull request #2 from willianjusten/master

Update from original
Add more links
Merge pull request #20 from jorgeatgu/master

Add more links