Merge pull request #5 from marcelluzs/master

merge