Included Achille's changes.
Added MainCPLEX for testing.