updated git functions
Merge branch 'develop'