Merge branch 'jc/setup'