merging master into gh-pages
removed hidden
concluding merge