Merge pull request #148 from matfed/master

New output format and some other changes
Merge branch 'master' of https://github.com/CeON/CoAnSys
adding missing changes
Merge branch 'research'