Merge pull request #43 from guidefloripa/master