Merge pull request #1 from tzi/master

Bugfix: the links always open the first one
Merge pull request #1 from mlbli/master

Update fork