Adds auto-lookup
Merge pull request #214 from ricardoquesada/auto_lookup

Adds auto-lookup