Fix #50
Merge pull request #51 from tripadvisor/iss50

Fix #50