Versión 10:34p
Merge branch 'master' of https://github.com/gaudisolutions/ecos