fixing merge conficts
Merge branch 'master' into gh-pages
fixed extra quote
Merge branch 'master' into gh-pages