fix setup path
Merge branch 'master' into geo