Merge pull request #1 from renra/foo

Foo
Added baz
Merge pull request #2 from renra/baz

Baz