Commit magallon 17-sep-2014
Merge branch 'master' of https://github.com/magallon/colorada