Tested with Ubuntu 13.10
Fixes wrong links
Merge branch 'step_by_step_installation'