Working version, added the term information
Merge pull request #5 from mcharris/master

Working version, added the term information