added Foo
foo debugged, working
Merge remote-tracking branch 'origin/master' into foo