Adds Chris changes fixes #55
Merge pull request #77 from CartoDB/iri/issue-55

Adds Chris changes fixes #55