Merge pull request #4 from marcioklein/master

m