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