Leak fixed and EpLibrary updated