Merge branch 'master' into federico
Merge pull request #36 from elitenomad/federico

Merge branch 'master' into federico