updates from opencobra / master