Merge pull request #5 from vilaca/production

sync dev and prod