Merge pull request #4 from maurociancio/master

Merge