Update
Merge branch 'master' of https://github.com/Gijsjan/managers
Update