kennethreitz Merge pull request #16 from carloshanson/patch-1