Improved Emulink: merged new functionalities from branch emulink-commented