Fix #52
Merge pull request #53 from tripadvisor/iss52

Fix #52
Fix #55
resolve conflicts