Fixed Ownership
Merge branch 'mnch' of https://github.com/WillyMareka/essential into mnch