Merge branch 'master' into research
Merge branch 'research' of https://github.com/matfed/CoAnSys into research
take a whole citation into consideration