merging from gh-pages
correcting link
merging from master