Shared code for Gonzalo Martinez.
Merge branch 'master' of https://github.com/rodrigoalvarez/camarasheterogeneas