Fixes #562
Fixes #561.
Merge branch 'master' of git@github.com:cwi-swat/rascal.git