Fix #57
Merge pull request #58 from tripadvisor/develop

Fix #57