Setup updates
Merge branch 'Setup' of github.com:dandart/projectchaplin into Setup