Added git cleanup
Merge branch 'master' into vertigo