Merge pull request #35 from euanh/planexsc

setup: Fix bad merge