Handle multiple terms
Merge pull request #988 from softwaregravy/1-x-stable

Handle multiple TERMs