Fix link problems
Merge branch 'master' of github.com:SSRR/SSRR2013