Merge pull request #4 from vilaca/production

keep up with fixes in prod
Merge pull request #14 from vilaca/dev-abuse

Merge pull request #4 from vilaca/production