Merge pull request #5 from vilaca/production

sync dev and prod
Merge pull request #6 from vilaca/development

Merge pull request #5 from vilaca/production