Merge pull request #161 from matfed/master

Clean-up
Merge branch 'master' of https://github.com/CeON/CoAnSys