Merge pull request #1 from wmartins/master

sync
Merge pull request #27 from marcioluizb/master

Merge pull request #1 from wmartins/master