Typo
Linked Wiki and FAQ on front page
Merge remote-tracking branch 'upstream/master'