Finished the lookup and all related changes.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #187 from dshurt/master

Master