Merge pull request #2 from dvl/master

Update repo
Merge pull request #12 from fernandovalente/master

Merge pull request #2 from dvl/master