Merge pull request #6 from vilaca/development

Merge pull request #5 from vilaca/production
Revert "Merge pull request #5 from vilaca/production"
Merge pull request #7 from vilaca/revert-6-development

Revert "Merge pull request #5 from vilaca/production"
Merge pull request #8 from vilaca/production

yet another merge