Merge pull request #3 from Javichuck/master

Montaje
Merge remote-tracking branch 'upstream/master'