adding missing changes
Merge branch 'research'
Merge pull request #150 from matfed/master

adding missing changes
chrum support for disambiguation
Merge branch 'master' of git://github.com/CeON/CoAnSys