pull request #5 from valeriosouza/master