modify setup
Merge branch 'master' into mosaic