pull 299 code review changes
Merge pull request #303 from bkng/develop

pull 299 code review changes