Importeer methodes verbeterd
Merge branch 'master' into testing