Merge branch 'master' of https://github.com/pdendek/CoAnSys
Merge branch 'master' of https://github.com/wosiu/CoAnSys
bug fixes in disambiguators, new tests