Refactor
Merge branch 'master' of github.com:gabynaiman/core_extended