Minor tweaks
Add hooks
Merge branch 'master' of https://github.com/eltados/mpm-magic