Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/CeON/CoAnSys
Merge remote-tracking branch 'acz-icm/master'
Merge remote-tracking branch 'upstream/master'
getting rid of warnings
Merge branch 'master' of https://github.com/CeON/CoAnSys
Merge pull request #117 from matfed/master

Getting rid of non-exhaustive match warnings