Merge pull request #4 from edgarcarmo/master

Merge