added absolute and relative URLs
Merge branch 'master' into gh-pages