Adds Chris changes fixes #55

Solves https://github.com/CartoDB/data-services/issues/55