regular commit from ubuntu
merged conflict in skf.py