tp #547
quick fixes tp 547 implementation bug
merge tp547 into master
Merge pull request #127 from kobotoolbox/tp547

Tp547