Code for review
Merge branch 'master' of https://github.com/fooflare/veneno