Latest changes including gitconfig