fixing merge conflicts
merging carmen's changes
Merge branch 'hsb-gh-pages' into gh-pages