Merge pull request #4 from marcelluzs/master

merge