Merge to production (gh-pages)

Merging updates from master to production (gh-pages)