Merge changes to go live on gh-pages 

Merge changes to go live on gh-pages