Fixes #17: Separate methods for keyword generation from tokens
Merged Lookup Refactoring + corrected concept goldstandard