changes after Neeyati's and Annette's tests
Merge branch 'master' into gh-pages