Updates
Merge branch 'master' of https://github.com/oscar-d-rodriguez/CRM