More advanced synonym handling
Merge pull request #3 from bsander/feature/advanced-synonym-handling

More advanced synonym handling