Merge pull request #96 from Pas8sion/issue64

#93, lookup for uppercase
tagging terms #64, item 2.0372