Pulling in master branch commits

Haven't changed anything. Just getting acquainted with git.