Merge Nypon / Update libs x2