Merge pull request #1 from cesoriano/master

Merge
Merge pull request #13 from aydee/master

Merge pull request #1 from cesoriano/master