Working version, added term infomation.
Merge pull request #2 from mcharris/master

Working version, added term infomation.