cleanup git code
Merge branch 'git'
version bump