Update README.md
Merge remote-tracking branch 'juan/master'