Merging Master into GH-Pages

Merging Master into GH-Pages