Improved links

- Replaced all long ugly links.
- Added additional links where necessary.
Merge pull request #688 from slavafomin/patch-1

Improved links
Merge branch 'FOS/master'