Merge Nypon / Update libs x1