Merge pull request #161 from matfed/master

Clean-up
limit the number of compared author tokens
Merge branch 'master' of https://github.com/CeON/CoAnSys
Merge branch 'master' into yadda-cit-eval