Merge branch 'master' into fuerte

Merge pull requests #1 and #2.