Fixes #110: problem now returns first and last token instead of single token
Merge pull request #111 from jeffmaury/ISSUE-110

Fixes #110: problem now returns first and last token instead of single token