merging in gh-pages to resolve potential merge issues