Merge pull request #2 from marcioklein/master

merge