Fixes #543
merge
Merge branch 'master' of github.com:cwi-swat/rascal