closes tp #553
Merge pull request #138 from kobotoolbox/tp553

closes tp #553