Moved to middle, fixed links
Merge remote-tracking branch 'origin/master'