Updates from opencobra:master