Merge pull request #49 from tripadvisor/develop

Fix #47, #48
Fix #50
Merge pull request #51 from tripadvisor/iss50

Fix #50