added Marco M's key
Resolve Marco M merge conflict
Merge branch 'marcoamorales-patch-1'