jco
Merge branch 'setupDir' into gh-pages