Merge branch 'simple-git'