Merge pull request #4 from edgarcarmo/master

Merge
Merge pull request #11 from atocf/master

Merge pull request #4 from edgarcarmo/master