added Esmeralda's work
Merge pull request #1 from smaraki/master

add esmeralda's work