Fix #47, #48
Merge branch 'master' into develop
Merge pull request #49 from tripadvisor/develop

Fix #47, #48