updated config, and foo
Merge branch '1'