merged hot changes in from gh-pages branch, and added my own additions