merging changes into gh-pages branch for hosting.