Merge pull request #6 from marcioklein/master

3