merging fixed links to gh-pages

from #105 and #104