New branch
Merge pull request #1 from michaelholst/gerardo

New branch