first commit
Merge https://github.com/themulti/consumo