Commiting all
Merge branch 'master' of https://github.com/edlahoz/dev-test