refactored lookups apis.
Merge remote-tracking branch 'origin/master' into dsc-123
merged in the latest changes from master branch.
code cleanup.
merged latest commit from master branch.
Merge pull request #125 from nla/dsc-123

merged.