Merge pull request #1 from MarceloRodriguez/MICASA

Micasa
Merge remote-tracking branch 'origin/master' into MICASA
Merge remote-tracking branch 'origin/master' into MICASA