Merge the changes from phonopy