refactored some stuff
Merge branch 'master' into 4.1