honestly I don't remember these changes
Merge branch 'master' of github.com:neggro/cargas-client
Merge branch 'master' of github.com:nmontesdeoca/cargas-client