fixes
merged commits from gh-pages