Merge pull request #289 from pdendek/master

Revert of changes in CoAnSys/disambiguation-author and other minor changes