Fixing production problems
Merge branch 'master' of github.com:caandradeduarte/caioduarte