Merge pull request #22 from brendandouglas/master

Project import generated by Copybara.