Merge pull request #432 from vered1986/master

Changes and fixes in the lexical aligner
Merge pull request #433 from vered1986/master

Added support for links in both directions
Fixing build