Merged latest changes into GH pages branch