Merge pull request #46 from tripadvisor/develop

fix #45
Merge branch 'master' into develop