fixing a typo and adding some links back
Merge remote-tracking branch 'origin/master'