Merged
Various changes
Merge branch 'master' of https://github.com/cwi-swat/rascal.git