implemented the automatic link generation for an entry
Merge branch 'automatic-links'