Added checks/fixed bugs
Updated overview
Fixes
Solved merge conflict
Merge branch 'master' of https://github.com/cwi-swat/rascal.git