fixed and merged to gh-pages