Minor changes in lookup
Merge branch 'master' into usage
bugfix
Merge branch 'master' into usage