Merge pull request #73 from albertodotcom/master

Merges
change links