Pulling to match Master and GH-Pages

pulling to match master and gh-pages