cc
Merge pull request #1 from soware/development

tentando fazer o merge