Merge pull request #7 from cesoriano/master

Merge