Merge pull request #1 from lpereira/master

merge