#307 Git fixed and tested