merged with gh-pages branch for publishing changes