fixies
Merge branch 'master' of github.com:alejorivera/chispudo