Restored from gh-pages
some changes