put cygpath in condition
Merge branch 'office' into home