Indigo devel

Updating the fork to the last version as it's needed by reemc simulation