modified core class
Merge branch 'master' of https://github.com/IPSEN2/Leenmeij