Merge pull request #6 from Affirm/dev

[release] 2.0.2-rc (est. Wed 30 July 2014)