Merge branch 'master' into Gh_Pages
Merge branch 'Gh_Pages'