allow match if first token is capitalized with multiple letters but the term is lower-case
created additional tests
code cleanups
Merge remote-tracking branch 'origin/master'